frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

os: signal handlers return void.

This commit is contained in:
Adam Jackson 2009-04-06 11:05:17 -04:00
parent aa6fbc2a36
commit 843166b033
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/os.h
View File

@ -83,13 +83,6 @@ typedef struct _NewClientRec *NewClientPtr;
#include <stdio.h> #include <stdio.h>
#include <stdarg.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 #ifdef DDXOSVERRORF
extern _X_EXPORT void (*OsVendorVErrorFProc)(const char *, va_list args); extern _X_EXPORT void (*OsVendorVErrorFProc)(const char *, va_list args);
#endif #endif
@ -202,9 +195,9 @@ extern _X_EXPORT void TimerFree(OsTimerPtr /* pTimer */);
extern _X_EXPORT void SetScreenSaverTimer(void); extern _X_EXPORT void SetScreenSaverTimer(void);
extern _X_EXPORT void FreeScreenSaverTimer(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); 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 *XNFprintf(const char *fmt, ...);
extern _X_EXPORT char *XNFvprintf(const char *fmt, va_list va); 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 */); extern _X_EXPORT OsSigHandlerPtr OsSignal(int /* sig */, OsSigHandlerPtr /* handler */);

6
os/utils.c
View File

@ -400,8 +400,7 @@ UnlockServer(void)
/* Force connections to close on SIGHUP from init */ /* Force connections to close on SIGHUP from init */
/*ARGSUSED*/ void
SIGVAL
AutoResetServer (int sig) AutoResetServer (int sig)
{ {
int olderrno = errno; int olderrno = errno;
@ -413,8 +412,7 @@ AutoResetServer (int sig)
/* Force connections to close and then exit on SIGTERM, SIGINT */ /* Force connections to close and then exit on SIGTERM, SIGINT */
/*ARGSUSED*/ void
SIGVAL
GiveUp(int sig) GiveUp(int sig)
{ {
int olderrno = errno; int olderrno = errno;