Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
5f742c1b
Commit
5f742c1b
authored
Feb 05, 2011
by
Paul Eggert
Browse files
* xfns.c: conform to C89 pointer rules
parent
4c83cffc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
src/ChangeLog
src/ChangeLog
+2
-0
src/bitmaps/gray.xbm
src/bitmaps/gray.xbm
+1
-1
src/xfns.c
src/xfns.c
+4
-4
No files found.
src/ChangeLog
View file @
5f742c1b
...
...
@@ -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>
src/bitmaps/gray.xbm
View file @
5f742c1b
#define gray_width 2
#define gray_height 2
static
unsigned
char gray_bits[] = {
static char gray_bits[] = {
0x01, 0x02};
src/xfns.c
View file @
5f742c1b
...
...
@@ -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
=
S
SDATA
(
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
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment