diff options
| author | Adam Jackson <ajax@redhat.com> | 2009-04-06 11:05:17 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2009-04-06 11:05:17 -0400 |
| commit | 843166b033dc0544b9f3cf3c91fc3ae3650bda14 (patch) | |
| tree | 9fcda0db5fd4d259726d53e3a3d8fce9ff486648 | |
| parent | aa6fbc2a3679896181610aee7ce2844d4322a5ce (diff) | |
os: signal handlers return void.
| -rw-r--r-- | include/os.h | 13 | ||||
| -rw-r--r-- | os/utils.c | 6 |
2 files changed, 5 insertions, 14 deletions
diff --git a/include/os.h b/include/os.h index 7da31a5ad..bda7125a0 100644 --- a/include/os.h +++ b/include/os.h @@ -83,13 +83,6 @@ typedef struct _NewClientRec *NewClientPtr; #include <stdio.h> #include <stdarg.h> -/* have to put $(SIGNAL_DEFINES) in DEFINES in Imakefile to get this right */ -#ifdef SIGNALRETURNSINT -#define SIGVAL int -#else -#define SIGVAL void -#endif - #ifdef DDXOSVERRORF extern _X_EXPORT void (*OsVendorVErrorFProc)(const char *, va_list args); #endif @@ -202,9 +195,9 @@ extern _X_EXPORT void TimerFree(OsTimerPtr /* pTimer */); extern _X_EXPORT void SetScreenSaverTimer(void); extern _X_EXPORT void FreeScreenSaverTimer(void); -extern _X_EXPORT SIGVAL AutoResetServer(int /*sig*/); +extern _X_EXPORT void AutoResetServer(int /*sig*/); -extern _X_EXPORT SIGVAL GiveUp(int /*sig*/); +extern _X_EXPORT void GiveUp(int /*sig*/); extern _X_EXPORT void UseMsg(void); @@ -234,7 +227,7 @@ extern _X_EXPORT char *Xvprintf(const char *fmt, va_list va); extern _X_EXPORT char *XNFprintf(const char *fmt, ...); extern _X_EXPORT char *XNFvprintf(const char *fmt, va_list va); -typedef SIGVAL (*OsSigHandlerPtr)(int /* sig */); +typedef void (*OsSigHandlerPtr)(int /* sig */); extern _X_EXPORT OsSigHandlerPtr OsSignal(int /* sig */, OsSigHandlerPtr /* handler */); diff --git a/os/utils.c b/os/utils.c index 66957d56f..78a50b254 100644 --- a/os/utils.c +++ b/os/utils.c @@ -400,8 +400,7 @@ UnlockServer(void) /* Force connections to close on SIGHUP from init */ -/*ARGSUSED*/ -SIGVAL +void AutoResetServer (int sig) { int olderrno = errno; @@ -413,8 +412,7 @@ AutoResetServer (int sig) /* Force connections to close and then exit on SIGTERM, SIGINT */ -/*ARGSUSED*/ -SIGVAL +void GiveUp(int sig) { int olderrno = errno; |