diff options
| -rw-r--r-- | nx-X11/programs/Xserver/include/os.h | 13 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/os/utils.c | 6 |
2 files changed, 5 insertions, 14 deletions
diff --git a/nx-X11/programs/Xserver/include/os.h b/nx-X11/programs/Xserver/include/os.h index 920b474db..7b8779579 100644 --- a/nx-X11/programs/Xserver/include/os.h +++ b/nx-X11/programs/Xserver/include/os.h @@ -86,13 +86,6 @@ typedef struct _NewClientRec *NewClientPtr; #endif #include <string.h> -/* have to put $(SIGNAL_DEFINES) in DEFINES in Imakefile to get this right */ -#ifdef SIGNALRETURNSINT -#define SIGVAL int -#else -#define SIGVAL void -#endif - extern void (*OsVendorVErrorFProc)(const char *, va_list args); extern int WaitForSomething( @@ -207,9 +200,9 @@ extern void SetDPMSTimers(void); extern void FreeDPMSTimers(void); #endif -extern SIGVAL AutoResetServer(int /*sig*/); +extern void AutoResetServer(int /*sig*/); -extern SIGVAL GiveUp(int /*sig*/); +extern void GiveUp(int /*sig*/); extern void UseMsg(void); @@ -240,7 +233,7 @@ extern _X_EXPORT char *Xvprintf(const char *fmt, va_list va)_X_ATTRIBUTE_PRINTF( extern _X_EXPORT char *XNFprintf(const char *fmt, ...) _X_ATTRIBUTE_PRINTF(1,2) _X_DEPRECATED; extern _X_EXPORT char *XNFvprintf(const char *fmt, va_list va)_X_ATTRIBUTE_PRINTF(1,0) _X_DEPRECATED; -typedef SIGVAL (*OsSigHandlerPtr)(int /* sig */); +typedef void (*OsSigHandlerPtr)(int /* sig */); extern OsSigHandlerPtr OsSignal(int /* sig */, OsSigHandlerPtr /* handler */); diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index e891758da..da4e9fb40 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -467,8 +467,7 @@ UnlockServer(void) /* Force connections to close on SIGHUP from init */ -/*ARGSUSED*/ -SIGVAL +void AutoResetServer (int sig) { int olderrno = errno; @@ -487,8 +486,7 @@ AutoResetServer (int sig) /* Force connections to close and then exit on SIGTERM, SIGINT */ -/*ARGSUSED*/ -SIGVAL +void GiveUp(int sig) { int olderrno = errno; |