Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/glsl/ast_function.cpp
	mesalib/src/glsl/glsl_types.cpp
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/main/texparam.c
	xorg-server/config/udev.c
	xorg-server/configure.ac
	xorg-server/dix/main.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/src/kdrive.c
	xorg-server/hw/xfree86/common/xf86Config.c
	xorg-server/hw/xfree86/common/xf86Configure.c
	xorg-server/hw/xfree86/common/xf86Helper.c
	xorg-server/hw/xfree86/common/xf86Init.c
	xorg-server/hw/xfree86/common/xf86Option.c
	xorg-server/hw/xfree86/common/xf86Priv.h
	xorg-server/hw/xfree86/common/xf86Xinput.c
	xorg-server/hw/xnest/Init.c
	xorg-server/hw/xquartz/darwin.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/xlaunch/config.cc
	xorg-server/hw/xwin/xlaunch/config.h
	xorg-server/hw/xwin/xlaunch/main.cc
	xorg-server/hw/xwin/xlaunch/resources/dialog.rc
	xorg-server/hw/xwin/xlaunch/resources/resources.h
	xorg-server/hw/xwin/xlaunch/resources/resources.rc
	xorg-server/hw/xwin/xlaunch/resources/strings.rc
	xorg-server/hw/xwin/xlaunch/window/util.cc
	xorg-server/hw/xwin/xlaunch/window/util.h
	xorg-server/hw/xwin/xlaunch/window/wizard.h
	xorg-server/include/os.h
	xorg-server/os/log.c
	xorg-server/xkeyboard-config/symbols/lv

1 files changed, 10 insertions, 3 deletions

diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h
index b7cf76db5..6800d4369 100644
--- a/xorg-server/include/os.h
+++ b/xorg-server/include/os.h
@@ -461,8 +461,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 */

@@ -510,7 +517,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);