aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann1999-09-16 20:20:10 +0000
committerGerd Moellmann1999-09-16 20:20:10 +0000
commit8d56e206a2d2a2d1e136b2399e261bdee80586e5 (patch)
treeb98e104c2ea67e70996be67c26fdb4a3c88bae03
parent15b0ced5c270350656a78f16b5c65348b0aa8956 (diff)
downloademacs-8d56e206a2d2a2d1e136b2399e261bdee80586e5.tar.gz
emacs-8d56e206a2d2a2d1e136b2399e261bdee80586e5.zip
(get_fallback): Remove unused variable.
(x_load_resources): Ditto. Put local variable used for Motif only in #ifdef USE_MOTIF.
-rw-r--r--src/xrdb.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/xrdb.c b/src/xrdb.c
index 92cc53aa433..ed3628f5265 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -398,8 +398,6 @@ static XrmDatabase
398get_fallback (display) 398get_fallback (display)
399 Display *display; 399 Display *display;
400{ 400{
401 XrmDatabase db;
402
403 return NULL; 401 return NULL;
404} 402}
405 403
@@ -524,14 +522,15 @@ x_load_resources (display, xrm_string, myname, myclass)
524 Display *display; 522 Display *display;
525 char *xrm_string, *myname, *myclass; 523 char *xrm_string, *myname, *myclass;
526{ 524{
527 char *xdefs;
528 XrmDatabase user_database; 525 XrmDatabase user_database;
529 XrmDatabase rdb; 526 XrmDatabase rdb;
530 XrmDatabase db; 527 XrmDatabase db;
531 char line[256]; 528 char line[256];
532 char *helv = "-*-helvetica-medium-r-*--*-120-*-*-*-*-iso8859-1"; 529 char *helv = "-*-helvetica-medium-r-*--*-120-*-*-*-*-iso8859-1";
530#ifdef USE_MOTIF
533 char *courier = "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1"; 531 char *courier = "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1";
534 extern Lisp_Object Vdouble_click_time; 532 extern Lisp_Object Vdouble_click_time;
533#endif
535 534
536 x_rm_string = XrmStringToQuark (XrmStringType); 535 x_rm_string = XrmStringToQuark (XrmStringType);
537#ifndef USE_X_TOOLKIT 536#ifndef USE_X_TOOLKIT