* xrdb.c (x_customization_string, x_rm_string): Now static.

diff --git a/src/ChangeLog b/src/ChangeLog
index 269dcf02eb01800621029b33819c8019aa370a8f..0d478b4cd07e7fb5c788daf2d07a130ec6a75acf 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-04-14  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * xrdb.c (x_customization_string, x_rm_string): Now static.
+
        * xmenu.c (x_menu_wait_for_event): Export only if USE_MOTIF.
        * xterm.h (x_menu_wait_for_event): Declare only if USE_MOTIF.
 

diff --git a/src/xrdb.c b/src/xrdb.c
index a79f453e5e1a1ed6611aba821bbc75abf1d5ab8d..d350f38a8c41ab649f7df567e9c9b067c81f66ea 100644 (file)
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -64,7 +64,7 @@ static int file_p (const char *filename);
 
 /* The string which gets substituted for the %C escape in XFILESEARCHPATH
    and friends, or zero if none was specified.  */
-char *x_customization_string;
+static char *x_customization_string;
 
 
 /* Return the value of the emacs.customization (Emacs.Customization)
@@ -466,7 +466,7 @@ get_environ_db (void)
 /* Types of values that we can find in a database */
 
 #define XrmStringType "String" /* String representation */
-XrmRepresentation x_rm_string; /* Quark representation */
+static XrmRepresentation x_rm_string;  /* Quark representation */
 
 /* Load X resources based on the display and a possible -xrm option. */