Commit 5f742c1b authored by Paul Eggert's avatar Paul Eggert
Browse files

* xfns.c: conform to C89 pointer rules

parent 4c83cffc
......@@ -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>
 
#define gray_width 2
#define gray_height 2
static unsigned char gray_bits[] = {
static char gray_bits[] = {
0x01, 0x02};
......@@ -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,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment