* xfns.c: conform to C89 pointer rules

3 files changed, 7 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5a269965186..37fff50aca1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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  <eggert@cs.ucla.edu>
 
diff --git a/src/bitmaps/gray.xbm b/src/bitmaps/gray.xbm
index d0e7a02bfac..dc7327e5c1a 100644
--- a/src/bitmaps/gray.xbm
+++ b/src/bitmaps/gray.xbm
@@ -1,4 +1,4 @@
 #define gray_width 2
 #define gray_height 2
-static unsigned char gray_bits[] = {
+static char gray_bits[] = {
    0x01, 0x02};
diff --git a/src/xfns.c b/src/xfns.c
index f8ac7c3f760..ce2d91e0df1 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4067,7 +4067,7 @@ terminate Emacs if we can't open the connection.
 \(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 @@ terminate Emacs if we can't open the connection.
 #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 @@ no value of TYPE (always string in the MS Windows case).  */)
             }
 
           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,