aboutsummaryrefslogtreecommitdiffstats
path: root/src/nsterm.m
diff options
context:
space:
mode:
authorPaul Eggert2013-08-26 14:31:50 -0700
committerPaul Eggert2013-08-26 14:31:50 -0700
commitf462f0750f4cd3537ab1da5cf8ed64e08e55ea46 (patch)
tree8bc31880fcaa044d09553dea12cbb846fda22b33 /src/nsterm.m
parent068f9124b4cb785f1743f2b50884f819d9d34f47 (diff)
downloademacs-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.m')
-rw-r--r--src/nsterm.m4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nsterm.m b/src/nsterm.m
index 287c119ba73..f7cc5933a53 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3540,7 +3540,8 @@ ns_read_socket (struct terminal *terminal, struct input_event *hold_quit)
3540 3540
3541int 3541int
3542ns_select (int nfds, fd_set *readfds, fd_set *writefds, 3542ns_select (int nfds, fd_set *readfds, fd_set *writefds,
3543 fd_set *exceptfds, EMACS_TIME *timeout, sigset_t *sigmask) 3543 fd_set *exceptfds, EMACS_TIME const *timeout,
3544 sigset_t const *sigmask)
3544/* -------------------------------------------------------------------------- 3545/* --------------------------------------------------------------------------
3545 Replacement for select, checking for events 3546 Replacement for select, checking for events
3546 -------------------------------------------------------------------------- */ 3547 -------------------------------------------------------------------------- */
@@ -3666,7 +3667,6 @@ ns_select (int nfds, fd_set *readfds, fd_set *writefds,
3666 pthread_mutex_lock (&select_mutex); 3667 pthread_mutex_lock (&select_mutex);
3667 if (readfds) *readfds = select_readfds; 3668 if (readfds) *readfds = select_readfds;
3668 if (writefds) *writefds = select_writefds; 3669 if (writefds) *writefds = select_writefds;
3669 if (timeout) *timeout = select_timeout;
3670 pthread_mutex_unlock (&select_mutex); 3670 pthread_mutex_unlock (&select_mutex);
3671 result = t; 3671 result = t;
3672 } 3672 }