diff options
| author | Paul Eggert | 2014-07-07 16:33:05 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-07-07 16:33:05 -0700 |
| commit | cae17e36bc98cbcf5aa54d90396de1fe1d7b5c77 (patch) | |
| tree | 12f28771f8d62c14c5f0281916aaecf02c152f6f /src/xterm.c | |
| parent | 0e14232948f875e390ed46348969b9ebeb9133c1 (diff) | |
| download | emacs-cae17e36bc98cbcf5aa54d90396de1fe1d7b5c77.tar.gz emacs-cae17e36bc98cbcf5aa54d90396de1fe1d7b5c77.zip | |
Minor fixups related to usage of the 'long' type.
* gnutls.c (emacs_gnutls_handshake):
* xfaces.c (dump_realized_face):
Work even if 'long' is narrower than 'void *'.
* termcap.c (scan_file):
* xselect.c (x_decline_selection_request)
(x_reply_selection_request, x_get_window_property):
* xterm.c (x_set_frame_alpha):
Remove unnecessary 'L' suffixes of integer constants.
* xfns.c (hack_wm_protocols):
* xselect.c (x_fill_property_data):
* xterm.c (x_set_offset, x_set_window_size_1, x_make_frame_invisible):
Remove unnecessary casts to 'long'.
(set_machine_and_pid_properties): Don't assume pid_t fits in 32 bits.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/xterm.c b/src/xterm.c index 45bb7b2a918..b7a7f0b3d4c 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -410,7 +410,7 @@ x_set_frame_alpha (struct frame *f) | |||
| 410 | if (parent != None) | 410 | if (parent != None) |
| 411 | XChangeProperty (dpy, parent, dpyinfo->Xatom_net_wm_window_opacity, | 411 | XChangeProperty (dpy, parent, dpyinfo->Xatom_net_wm_window_opacity, |
| 412 | XA_CARDINAL, 32, PropModeReplace, | 412 | XA_CARDINAL, 32, PropModeReplace, |
| 413 | (unsigned char *) &opac, 1L); | 413 | (unsigned char *) &opac, 1); |
| 414 | 414 | ||
| 415 | /* return unless necessary */ | 415 | /* return unless necessary */ |
| 416 | { | 416 | { |
| @@ -420,7 +420,7 @@ x_set_frame_alpha (struct frame *f) | |||
| 420 | unsigned long n, left; | 420 | unsigned long n, left; |
| 421 | 421 | ||
| 422 | rc = XGetWindowProperty (dpy, win, dpyinfo->Xatom_net_wm_window_opacity, | 422 | rc = XGetWindowProperty (dpy, win, dpyinfo->Xatom_net_wm_window_opacity, |
| 423 | 0L, 1L, False, XA_CARDINAL, | 423 | 0, 1, False, XA_CARDINAL, |
| 424 | &actual, &format, &n, &left, | 424 | &actual, &format, &n, &left, |
| 425 | &data); | 425 | &data); |
| 426 | 426 | ||
| @@ -438,7 +438,7 @@ x_set_frame_alpha (struct frame *f) | |||
| 438 | 438 | ||
| 439 | XChangeProperty (dpy, win, dpyinfo->Xatom_net_wm_window_opacity, | 439 | XChangeProperty (dpy, win, dpyinfo->Xatom_net_wm_window_opacity, |
| 440 | XA_CARDINAL, 32, PropModeReplace, | 440 | XA_CARDINAL, 32, PropModeReplace, |
| 441 | (unsigned char *) &opac, 1L); | 441 | (unsigned char *) &opac, 1); |
| 442 | x_uncatch_errors (); | 442 | x_uncatch_errors (); |
| 443 | } | 443 | } |
| 444 | 444 | ||
| @@ -8094,7 +8094,7 @@ x_set_offset (struct frame *f, register int xoff, register int yoff, int change_ | |||
| 8094 | x_calc_absolute_position (f); | 8094 | x_calc_absolute_position (f); |
| 8095 | 8095 | ||
| 8096 | block_input (); | 8096 | block_input (); |
| 8097 | x_wm_set_size_hint (f, (long) 0, 0); | 8097 | x_wm_set_size_hint (f, 0, 0); |
| 8098 | 8098 | ||
| 8099 | modified_left = f->left_pos; | 8099 | modified_left = f->left_pos; |
| 8100 | modified_top = f->top_pos; | 8100 | modified_top = f->top_pos; |
| @@ -8639,7 +8639,7 @@ x_set_window_size_1 (struct frame *f, int change_gravity, int width, int height, | |||
| 8639 | + FRAME_MENUBAR_HEIGHT (f) | 8639 | + FRAME_MENUBAR_HEIGHT (f) |
| 8640 | + FRAME_TOOLBAR_HEIGHT (f)); | 8640 | + FRAME_TOOLBAR_HEIGHT (f)); |
| 8641 | if (change_gravity) f->win_gravity = NorthWestGravity; | 8641 | if (change_gravity) f->win_gravity = NorthWestGravity; |
| 8642 | x_wm_set_size_hint (f, (long) 0, 0); | 8642 | x_wm_set_size_hint (f, 0, 0); |
| 8643 | XResizeWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), | 8643 | XResizeWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), |
| 8644 | pixelwidth, pixelheight); | 8644 | pixelwidth, pixelheight); |
| 8645 | 8645 | ||
| @@ -9046,7 +9046,7 @@ x_make_frame_invisible (struct frame *f) | |||
| 9046 | program-specified, so that when the window is mapped again, it will be | 9046 | program-specified, so that when the window is mapped again, it will be |
| 9047 | placed at the same location, without forcing the user to position it | 9047 | placed at the same location, without forcing the user to position it |
| 9048 | by hand again (they have already done that once for this window.) */ | 9048 | by hand again (they have already done that once for this window.) */ |
| 9049 | x_wm_set_size_hint (f, (long) 0, 1); | 9049 | x_wm_set_size_hint (f, 0, 1); |
| 9050 | 9050 | ||
| 9051 | #ifdef USE_GTK | 9051 | #ifdef USE_GTK |
| 9052 | if (FRAME_GTK_OUTER_WIDGET (f)) | 9052 | if (FRAME_GTK_OUTER_WIDGET (f)) |