diff options
| author | Paul Eggert | 2013-08-26 14:31:50 -0700 |
|---|---|---|
| committer | Paul Eggert | 2013-08-26 14:31:50 -0700 |
| commit | f462f0750f4cd3537ab1da5cf8ed64e08e55ea46 (patch) | |
| tree | 8bc31880fcaa044d09553dea12cbb846fda22b33 /src/nsterm.h | |
| parent | 068f9124b4cb785f1743f2b50884f819d9d34f47 (diff) | |
| download | emacs-f462f0750f4cd3537ab1da5cf8ed64e08e55ea46.tar.gz emacs-f462f0750f4cd3537ab1da5cf8ed64e08e55ea46.zip | |
Fix minor problems found by static checking.
* image.c (XGetPixel, XPutPixel) [HAVE_NS]: Now static.
(expect): Avoid nested-if warning.
(x_build_heuristic_mask) [HAVE_NS]: Avoid unused-var warning.
* nsmenu.m (fillWithWidgetValue:): Avoid type warning.
* nsterm.h, nsterm.m (ns_select):
* xgselect.c, xgselect.h (xg_select):
Adjust signature to better match pselect's.
* nsterm.m (ns_select):
Don't set *TIMEOUT, since pselect doesn't.
* regex.c (whitespace_regexp): Now const_re_char *, to avoid
diagnostic about assigning const char * to it.
* xfaces.c (x_display_info) [HAVE_NS]: Remove; unused.
Diffstat (limited to 'src/nsterm.h')
| -rw-r--r-- | src/nsterm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nsterm.h b/src/nsterm.h index c34067991f6..a3174ade07b 100644 --- a/src/nsterm.h +++ b/src/nsterm.h | |||
| @@ -874,8 +874,8 @@ extern int x_display_pixel_width (struct ns_display_info *); | |||
| 874 | /* This in nsterm.m */ | 874 | /* This in nsterm.m */ |
| 875 | extern void x_destroy_window (struct frame *f); | 875 | extern void x_destroy_window (struct frame *f); |
| 876 | extern int ns_select (int nfds, fd_set *readfds, fd_set *writefds, | 876 | extern int ns_select (int nfds, fd_set *readfds, fd_set *writefds, |
| 877 | fd_set *exceptfds, EMACS_TIME *timeout, | 877 | fd_set *exceptfds, EMACS_TIME const *timeout, |
| 878 | sigset_t *sigmask); | 878 | sigset_t const *sigmask); |
| 879 | extern unsigned long ns_get_rgb_color (struct frame *f, | 879 | extern unsigned long ns_get_rgb_color (struct frame *f, |
| 880 | float r, float g, float b, float a); | 880 | float r, float g, float b, float a); |
| 881 | extern NSPoint last_mouse_motion_position; | 881 | extern NSPoint last_mouse_motion_position; |