aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/include
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-08-01 09:05:15 +0200
committermarha <marha@users.sourceforge.net>2011-08-01 09:05:15 +0200
commitf87ad0cdc41af88f134475ab50b0d604004d9cdc (patch)
tree72e8cd139cf22d66d77c6a52f72b3d5c11c330f3 /xorg-server/include
parent28257038c4f13ac26127d536c14c922aa036efed (diff)
downloadvcxsrv-f87ad0cdc41af88f134475ab50b0d604004d9cdc.tar.gz
vcxsrv-f87ad0cdc41af88f134475ab50b0d604004d9cdc.tar.bz2
vcxsrv-f87ad0cdc41af88f134475ab50b0d604004d9cdc.zip
mesa xserver pixman xkeyboard-config git update 1 aug 2011
Diffstat (limited to 'xorg-server/include')
-rw-r--r--xorg-server/include/os.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h
index 506dc5d2a..a553f5783 100644
--- a/xorg-server/include/os.h
+++ b/xorg-server/include/os.h
@@ -459,8 +459,15 @@ typedef struct {
/* stuff for FlushCallback */
extern _X_EXPORT CallbackListPtr FlushCallback;
-extern _X_EXPORT void AbortDDX(void);
-extern _X_EXPORT void ddxGiveUp(void);
+enum ExitCode {
+ EXIT_NO_ERROR = 0,
+ EXIT_ERR_ABORT = 1,
+ EXIT_ERR_CONFIGURE = 2,
+ EXIT_ERR_DRIVERS = 3,
+};
+
+extern _X_EXPORT void AbortDDX(enum ExitCode error);
+extern _X_EXPORT void ddxGiveUp(enum ExitCode error);
extern _X_EXPORT int TimeSinceLastInputEvent(void);
/* strcasecmp.c */
@@ -508,7 +515,7 @@ typedef enum {
} MessageType;
extern _X_EXPORT const char *LogInit(const char *fname, const char *backup);
-extern _X_EXPORT void LogClose(void);
+extern _X_EXPORT void LogClose(enum ExitCode error);
extern _X_EXPORT Bool LogSetParameter(LogParameter param, int value);
extern _X_EXPORT void LogVWrite(int verb, const char *f, va_list args) _X_ATTRIBUTE_PRINTF(2,0);
extern _X_EXPORT void LogWrite(int verb, const char *f, ...) _X_ATTRIBUTE_PRINTF(2,3);