Commit 2172544b authored by Paul Eggert's avatar Paul Eggert
Browse files

* xfns.c (Fx_window_property): Simplify a bit,

to make a bit faster and to avoid GCC 4.6.0 warning.
* xselect.c (x_get_window_property, x_handle_dnd_message): Likewise.
parent e50d64eb
2011-04-19 Paul Eggert <eggert@cs.ucla.edu> 2011-04-19 Paul Eggert <eggert@cs.ucla.edu>
* xfns.c (Fx_window_property): Simplify a bit,
to make a bit faster and to avoid GCC 4.6.0 warning.
* xselect.c (x_get_window_property, x_handle_dnd_message): Likewise.
* fns.c (internal_equal): Don't assume size_t fits in int. * fns.c (internal_equal): Don't assume size_t fits in int.
* alloc.c (compact_small_strings): Tighten assertion a little. * alloc.c (compact_small_strings): Tighten assertion a little.
......
...@@ -4352,7 +4352,7 @@ no value of TYPE (always string in the MS Windows case). */) ...@@ -4352,7 +4352,7 @@ no value of TYPE (always string in the MS Windows case). */)
property and those are indeed in 32 bit quantities if format is property and those are indeed in 32 bit quantities if format is
32. */ 32. */
if (actual_format == 32 && actual_format < BITS_PER_LONG) if (32 < BITS_PER_LONG && actual_format == 32)
{ {
unsigned long i; unsigned long i;
int *idata = (int *) tmp_data; int *idata = (int *) tmp_data;
......
...@@ -1477,7 +1477,7 @@ x_get_window_property (Display *display, Window window, Atom property, ...@@ -1477,7 +1477,7 @@ x_get_window_property (Display *display, Window window, Atom property,
The bytes and offsets passed to XGetWindowProperty refers to the The bytes and offsets passed to XGetWindowProperty refers to the
property and those are indeed in 32 bit quantities if format is 32. */ property and those are indeed in 32 bit quantities if format is 32. */
if (*actual_format_ret == 32 && *actual_format_ret < BITS_PER_LONG) if (32 < BITS_PER_LONG && *actual_format_ret == 32)
{ {
unsigned long i; unsigned long i;
int *idata = (int *) ((*data_ret) + offset); int *idata = (int *) ((*data_ret) + offset);
...@@ -2432,7 +2432,7 @@ x_handle_dnd_message (struct frame *f, XClientMessageEvent *event, struct x_disp ...@@ -2432,7 +2432,7 @@ x_handle_dnd_message (struct frame *f, XClientMessageEvent *event, struct x_disp
function expects them to be of size int (i.e. 32). So to be able to function expects them to be of size int (i.e. 32). So to be able to
use that function, put the data in the form it expects if format is 32. */ use that function, put the data in the form it expects if format is 32. */
if (event->format == 32 && event->format < BITS_PER_LONG) if (32 < BITS_PER_LONG && event->format == 32)
{ {
for (i = 0; i < 5; ++i) /* There are only 5 longs in a ClientMessage. */ for (i = 0; i < 5; ++i) /* There are only 5 longs in a ClientMessage. */
idata[i] = (int) event->data.l[i]; idata[i] = (int) event->data.l[i];
......
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