* dispextern.h (check_x_display_info, x_get_string_resource):

Declare here just once and unify the latter.
* frame.c (check_x_display_info, x_get_string_resource):
* nsterm.h (check_x_display_info):
* xrdb.c (x_get_string_resource):
* xterm.h (check_x_display_info): Remove prototypes.
* nsfns.m (x_get_string_resource): Likewise.  Adjust definition.
* w32reg.c (x_get_string_resource): Likewise.
(w32_get_rdb_resource): Adjust user.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5763940a2472dec0d6ca8b3bc50a0025c3206a01..8583bbb19fbcf17d1182ee69c1435fc8335db40c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2013-09-17  Dmitry Antipov  <dmantipov@yandex.ru>
+
+       * dispextern.h (check_x_display_info, x_get_string_resource):
+       Declare here just once and unify the latter.
+       * frame.c (check_x_display_info, x_get_string_resource):
+       * nsterm.h (check_x_display_info):
+       * xrdb.c (x_get_string_resource):
+       * xterm.h (check_x_display_info): Remove prototypes.
+       * nsfns.m (x_get_string_resource): Likewise.  Adjust definition.
+       * w32reg.c (x_get_string_resource): Likewise.
+       (w32_get_rdb_resource): Adjust user.
+
 2013-09-17  Dmitry Antipov  <dmantipov@yandex.ru>
 
        * xterm.h (struct x_display_info): New member

diff --git a/src/dispextern.h b/src/dispextern.h
index 67de6bffabf5dcd496b7c52d683b84227411a499..e91403bce6861c0ecb668a78860397e86dc9827a 100644 (file)
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -61,6 +61,7 @@ xstrcasecmp (char const *a, char const *b)
 }
 
 #ifdef HAVE_X_WINDOWS
+#include <X11/Xresource.h> /* for XrmDatabase */
 typedef struct x_display_info Display_Info;
 typedef XImage * XImagePtr;
 typedef XImagePtr XImagePtr_or_DC;
@@ -3530,6 +3531,7 @@ enum resource_types
   RES_TYPE_BOOLEAN_NUMBER
 };
 
+extern Display_Info *check_x_display_info (Lisp_Object);
 extern Lisp_Object x_get_arg (Display_Info *, Lisp_Object,
                               Lisp_Object, const char *, const char *class,
                               enum resource_types);
@@ -3541,6 +3543,8 @@ extern Lisp_Object x_default_parameter (struct frame *, Lisp_Object,
                                         Lisp_Object, Lisp_Object,
                                         const char *, const char *,
                                         enum resource_types);
+extern char *x_get_string_resource (XrmDatabase, const char *,
+                                   const char *);
 
 #endif /* HAVE_WINDOW_SYSTEM */
 

diff --git a/src/frame.c b/src/frame.c
index 8eabef55d1b9f9d61ddff6b4b327001a1dcbf23f..1f2b2b9c223383674a4fb834279e65ecb6040c6d 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -3520,11 +3520,6 @@ validate_x_resource_name (void)
     }
 }
 
-
-extern char *x_get_string_resource (XrmDatabase, const char *, const char *);
-extern Display_Info *check_x_display_info (Lisp_Object);
-
-
 /* Get specified attribute from resource database RDB.
    See Fx_get_resource below for other parameters.  */
 

diff --git a/src/nsfns.m b/src/nsfns.m
index 574239873a06bf6d8a4c769be845cf20a265cea0..408e6d2176ea7c031e8bc6d3515d49ab6989e841 100644 (file)
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -2211,17 +2211,13 @@ x_set_scroll_bar_default_width (struct frame *f)
                                       wid - 1) / wid;
 }
 
-
-extern const char *x_get_string_resource (XrmDatabase, char *, char *);
-
-
 /* terms impl this instead of x-get-resource directly */
-const char *
-x_get_string_resource (XrmDatabase rdb, char *name, char *class)
+char *
+x_get_string_resource (XrmDatabase rdb, const char *name, const char *class)
 {
   /* remove appname prefix; TODO: allow for !="Emacs" */
-  char *toCheck = class + (!strncmp (class, "Emacs.", 6) ? 6 : 0);
-  const char *res;
+  const char *res, *toCheck = class + (!strncmp (class, "Emacs.", 6) ? 6 : 0);
+
   check_window_system (NULL);
 
   if (inhibit_x_resources)
@@ -2229,9 +2225,9 @@ x_get_string_resource (XrmDatabase rdb, char *name, char *class)
     return NULL;
 
   res = ns_get_defaults_value (toCheck);
-  return !res ? NULL :
-      (!c_strncasecmp (res, "YES", 3) ? "true" :
-          (!c_strncasecmp (res, "NO", 2) ? "false" : res));
+  return (!res ? NULL :
+         (!c_strncasecmp (res, "YES", 3) ? "true" :
+          (!c_strncasecmp (res, "NO", 2) ? "false" : (char *) res)));
 }
 
 

diff --git a/src/nsterm.h b/src/nsterm.h
index 1b5804b98b5e7a516f5fa42a14f2aa781c029d50..30ae871da8375e00bb4d1063b4d272b377345b60 100644 (file)
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -605,8 +605,6 @@ extern struct ns_display_info *x_display_list;
 extern Lisp_Object ns_display_name_list;
 extern struct ns_display_info *ns_display_info_for_name (Lisp_Object name);
 
-struct ns_display_info *check_x_display_info (Lisp_Object frame);
-
 struct ns_output
 {
 #ifdef __OBJC__

diff --git a/src/w32reg.c b/src/w32reg.c
index e7c4e9ea3513abf66f03ec1302196ca61084d693..9d088538e0b43492ab1139c6f00eb043ea6fbd41 100644 (file)
--- a/src/w32reg.c
+++ b/src/w32reg.c
@@ -56,7 +56,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 */
 
 static char *
-w32_get_rdb_resource (char *rdb, char *resource)
+w32_get_rdb_resource (char *rdb, const char *resource)
 {
   char *value = rdb;
   int len = strlen (resource);
@@ -141,7 +141,7 @@ w32_get_string_resource (char *name, char *class, DWORD dwexptype)
    database RDB. */
 
 char *
-x_get_string_resource (XrmDatabase rdb, char *name, char *class)
+x_get_string_resource (XrmDatabase rdb, const char *name, const char *class)
 {
   if (rdb)
     {

diff --git a/src/xrdb.c b/src/xrdb.c
index 60dcdae080dfb468539f767765f51947d6f86d08..52988f0818a601f2018d1f3cfb852658085841ee 100644 (file)
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -48,10 +48,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "keyboard.h"
 #endif
 
-char *x_get_string_resource (XrmDatabase rdb, const char *name,
-                            const char *class);
-
-\f
 /* X file search path processing.  */
 
 

diff --git a/src/xterm.h b/src/xterm.h
index 382cf30e1d61db1f99e2e2bb100c221cb4126f1f..e1556de36b9fdd731e0eeab9e46f303ecb415731 100644 (file)
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -975,7 +975,6 @@ extern void x_clipboard_manager_save_all (void);
 
 /* Defined in xfns.c */
 
-extern struct x_display_info * check_x_display_info (Lisp_Object);
 extern Lisp_Object x_get_focus_frame (struct frame *);
 
 #ifdef USE_GTK