diff options
| author | Michael Reed <m.reed@mykolab.com> | 2015-08-26 13:27:05 -0400 |
|---|---|---|
| committer | Michael Reed <m.reed@mykolab.com> | 2015-08-27 16:56:05 -0400 |
| commit | 2d50a956011cfdd70efc3ebb60e9d27bd97ffdb6 (patch) | |
| tree | 7a1f9f341c030b1e3489ea85115339126382322a | |
| parent | 3b99d8d0dd82f866b80822af2220a005fdd83db2 (diff) | |
| download | rneovim-2d50a956011cfdd70efc3ebb60e9d27bd97ffdb6.tar.gz rneovim-2d50a956011cfdd70efc3ebb60e9d27bd97ffdb6.tar.bz2 rneovim-2d50a956011cfdd70efc3ebb60e9d27bd97ffdb6.zip | |
os/os_defs.h cleanup: Remaining signal stuff
RETSIGTYPE, SIGRETURN, and SIGDEFARG are always defined the same, so
inline them for simplicity; SIGDUMMYARG, however, is unused, so remove
it.
Even if these things don't work on windows, the signal handler in
if_cscope.c is already wrapped with '#idef UNIX', as is its only call
site.
Reviewed-by: Justin M. Keyes <justinkz@gmail.com>
| -rw-r--r-- | config/config.h.in | 2 | ||||
| -rw-r--r-- | src/nvim/if_cscope.c | 5 | ||||
| -rw-r--r-- | src/nvim/os/os_defs.h | 3 |
3 files changed, 2 insertions, 8 deletions
diff --git a/config/config.h.in b/config/config.h.in index 076a5a7ff9..54a405727d 100644 --- a/config/config.h.in +++ b/config/config.h.in @@ -51,8 +51,6 @@ #cmakedefine HAVE_UTIME_H #cmakedefine HAVE_UTIMES #cmakedefine HAVE_WORKING_LIBINTL -#define RETSIGTYPE void -#define SIGRETURN return #cmakedefine UNIX #cmakedefine USE_FNAME_CASE #define USEMAN_S 1 diff --git a/src/nvim/if_cscope.c b/src/nvim/if_cscope.c index d6c5cf4fd5..5e1c5e9171 100644 --- a/src/nvim/if_cscope.c +++ b/src/nvim/if_cscope.c @@ -1829,10 +1829,9 @@ static int cs_read_prompt(int i) /* * Used to catch and ignore SIGALRM below. */ -static RETSIGTYPE -sig_handler SIGDEFARG(sigarg) { +static void sig_handler(int s) { /* do nothing */ - SIGRETURN; + return; } #endif diff --git a/src/nvim/os/os_defs.h b/src/nvim/os/os_defs.h index 25dd6a2ad2..f0f74857e0 100644 --- a/src/nvim/os/os_defs.h +++ b/src/nvim/os/os_defs.h @@ -13,9 +13,6 @@ # include "nvim/os/unix_defs.h" #endif -#define SIGDEFARG(s) (int s) -#define SIGDUMMYARG 0 - #if defined(DIRSIZ) && !defined(MAXNAMLEN) # define MAXNAMLEN DIRSIZ #endif |