[Emacs-diffs] /srv/bzr/emacs/trunk r103141: Merge: * xfns.c: conform to C89 pointer rules

[Paul Eggert]

------------------------------------------------------------
revno: 103141 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2011-02-05 19:49:08 -0800
message:
  Merge: * xfns.c: conform to C89 pointer rules
modified:
  src/ChangeLog
  src/bitmaps/gray.xbm
  src/xfns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-02-06 03:13:16 +0000
+++ b/src/ChangeLog     2011-02-06 03:48:28 +0000
@@ -12,6 +12,8 @@
        rules about pointer type compatibility.
        * doc.c (get_doc_string, Fsnarf_documentation):
        (Fsubstitute_command_keys): Likewise.
+       * xfns.c (Fx_open_connection, Fx_window_property): Likewise.
+       * bitmaps/gray.xbm (gray_bits): Likewise.
 
 2011-02-05  Paul Eggert  <address@hidden>
 

=== modified file 'src/bitmaps/gray.xbm'
--- a/src/bitmaps/gray.xbm      1999-09-29 16:37:29 +0000
+++ b/src/bitmaps/gray.xbm      2011-02-06 03:48:28 +0000
@@ -1,4 +1,4 @@
 #define gray_width 2
 #define gray_height 2
-static unsigned char gray_bits[] = {
+static char gray_bits[] = {
    0x01, 0x02};

=== modified file 'src/xfns.c'
--- a/src/xfns.c        2011-01-30 22:17:44 +0000
+++ b/src/xfns.c        2011-02-06 03:48:28 +0000
@@ -4067,7 +4067,7 @@
 \(In the Nextstep version, the last two arguments are currently ignored.)  */)
   (Lisp_Object display, Lisp_Object xrm_string, Lisp_Object must_succeed)
 {
-  unsigned char *xrm_option;
+  char *xrm_option;
   struct x_display_info *dpyinfo;
 
   CHECK_STRING (display);
@@ -4080,9 +4080,9 @@
 #endif
 
   if (! NILP (xrm_string))
-    xrm_option = SDATA (xrm_string);
+    xrm_option = SSDATA (xrm_string);
   else
-    xrm_option = (unsigned char *) 0;
+    xrm_option = (char *) 0;
 
   validate_x_resource_name ();
 
@@ -4394,7 +4394,7 @@
             }
 
           if (NILP (vector_ret_p))
-            prop_value = make_string (tmp_data, size);
+            prop_value = make_string ((char *) tmp_data, size);
           else
             prop_value = x_property_data_to_lisp (f,
                                                   tmp_data,