diff options
Diffstat (limited to 'os')
| -rw-r--r-- | os/connection.c | 4 | ||||
| -rw-r--r-- | os/log.c | 11 | ||||
| -rw-r--r-- | os/osdep.h | 14 | ||||
| -rw-r--r-- | os/osinit.c | 11 | ||||
| -rw-r--r-- | os/utils.c | 1 |
5 files changed, 28 insertions, 13 deletions
diff --git a/os/connection.c b/os/connection.c index 9a4a16847..bd46ae68b 100644 --- a/os/connection.c +++ b/os/connection.c @@ -93,17 +93,15 @@ SOFTWARE. #include <netinet/tcp.h> #include <arpa/inet.h> #endif - #include <sys/uio.h> - #endif /* WIN32 */ #include "dix/dix_priv.h" #include "os/audit.h" #include "os/auth.h" +#include "os/osdep.h" #include "misc.h" /* for typedef of pointer */ -#include "osdep.h" #include "opaque.h" #include "dixstruct.h" #include "xace.h" @@ -79,20 +79,21 @@ OR PERFORMANCE OF THIS SOFTWARE. #include <dix-config.h> #endif -#include <X11/Xos.h> +#include <errno.h> #include <stdio.h> -#include <time.h> -#include <sys/stat.h> #include <stdarg.h> #include <stdlib.h> /* for malloc() */ -#include <errno.h> +#include <sys/stat.h> +#include <time.h> +#include <X11/Xos.h> + +#include "os/osdep.h" #include "os/audit.h" #include "os/fmt.h" #include "input.h" #include "opaque.h" -#include "osdep.h" #ifdef WIN32 #include <process.h> diff --git a/os/osdep.h b/os/osdep.h index 97e227cfa..7221d112f 100644 --- a/os/osdep.h +++ b/os/osdep.h @@ -174,4 +174,18 @@ int xthread_sigmask(int how, const sigset_t *set, sigset_t *oldest); extern void (*OsVendorVErrorFProc) (const char *, va_list args) _X_ATTRIBUTE_PRINTF(1, 0); +typedef void (*OsSigHandlerPtr) (int sig); + +/* install signal handler */ +OsSigHandlerPtr OsSignal(int sig, OsSigHandlerPtr handler); + +void OsInit(void); +void OsCleanup(Bool); +void OsVendorFatalError(const char *f, va_list args) _X_ATTRIBUTE_PRINTF(1, 0); +void OsVendorInit(void); +void OsBlockSignals(void); +void OsReleaseSignals(void); +void OsResetSignals(void); +void OsAbort(void) _X_NORETURN; + #endif /* _OSDEP_H_ */ diff --git a/os/osinit.c b/os/osinit.c index 9d4e5bbc2..465b3df14 100644 --- a/os/osinit.c +++ b/os/osinit.c @@ -48,14 +48,11 @@ SOFTWARE. #include <dix-config.h> #endif +#include <errno.h> #include <stdio.h> +#include <signal.h> #include <X11/X.h> -#include "os.h" -#include "osdep.h" -#include "opaque.h" #include <X11/Xos.h> -#include <signal.h> -#include <errno.h> #ifdef HAVE_DLFCN_H #include <dlfcn.h> #endif @@ -64,9 +61,13 @@ SOFTWARE. #endif #include "os/busfault.h" +#include "os/osdep.h" #include "misc.h" +#include "os.h" +#include "opaque.h" +#include "misc.h" #include "dixstruct.h" #if !defined(SYSV) && !defined(WIN32) diff --git a/os/utils.c b/os/utils.c index 9ba84be28..4c5c9e987 100644 --- a/os/utils.c +++ b/os/utils.c @@ -109,6 +109,7 @@ __stdcall unsigned long GetTickCount(void); #include "dix/dix_priv.h" #include "os/auth.h" #include "os/cmdline.h" +#include "os/osdep.h" #include "dixstruct.h" #include "xkbsrv.h" |