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>
This commit is contained in:
Michael Reed
2015-08-26 13:27:05 -04:00
parent 3b99d8d0dd
commit 2d50a95601
3 changed files with 2 additions and 8 deletions

View File

@@ -51,8 +51,6 @@
#cmakedefine HAVE_UTIME_H #cmakedefine HAVE_UTIME_H
#cmakedefine HAVE_UTIMES #cmakedefine HAVE_UTIMES
#cmakedefine HAVE_WORKING_LIBINTL #cmakedefine HAVE_WORKING_LIBINTL
#define RETSIGTYPE void
#define SIGRETURN return
#cmakedefine UNIX #cmakedefine UNIX
#cmakedefine USE_FNAME_CASE #cmakedefine USE_FNAME_CASE
#define USEMAN_S 1 #define USEMAN_S 1

View File

@@ -1829,10 +1829,9 @@ static int cs_read_prompt(int i)
/* /*
* Used to catch and ignore SIGALRM below. * Used to catch and ignore SIGALRM below.
*/ */
static RETSIGTYPE static void sig_handler(int s) {
sig_handler SIGDEFARG(sigarg) {
/* do nothing */ /* do nothing */
SIGRETURN; return;
} }
#endif #endif

View File

@@ -13,9 +13,6 @@
# include "nvim/os/unix_defs.h" # include "nvim/os/unix_defs.h"
#endif #endif
#define SIGDEFARG(s) (int s)
#define SIGDUMMYARG 0
#if defined(DIRSIZ) && !defined(MAXNAMLEN) #if defined(DIRSIZ) && !defined(MAXNAMLEN)
# define MAXNAMLEN DIRSIZ # define MAXNAMLEN DIRSIZ
#endif #endif