xserver: Branch 'master' - 3 commits

[Adam Jackson]

 hw/kdrive/linux/tslib.c          |    2 +-
 hw/xfree86/common/modeline2c.awk |    3 ---
 include/os.h                     |   13 +++----------
 os/connection.c                  |    9 ---------
 os/utils.c                       |    6 ++----
 5 files changed, 6 insertions(+), 27 deletions(-)

New commits:
commit 5f769b73441cf29c05a05c728ab81bdde1fc00b6
Author: David Jander <david.jander at protonic.nl>
Date:   Mon Apr 6 13:01:08 2009 -0400

    kdrive: Fix segfault in tslib support

diff --git a/hw/kdrive/linux/tslib.c b/hw/kdrive/linux/tslib.c
index 19c8e84..59011b0 100644
--- a/hw/kdrive/linux/tslib.c
+++ b/hw/kdrive/linux/tslib.c
@@ -114,7 +114,7 @@ TslibEnable (KdPointerInfo *pi)
     private->raw_event_hook = NULL;
     private->raw_event_closure = NULL;
     if (!pi->path) {
-        pi->path = "/dev/input/touchscreen0";
+        pi->path = strdup("/dev/input/touchscreen0");
         ErrorF("[tslib/TslibEnable] no device path given, trying %s\n", pi->path);
     }
     private->tsDev = ts_open(pi->path, 0);
commit 843166b033dc0544b9f3cf3c91fc3ae3650bda14
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Apr 6 11:05:17 2009 -0400

    os: signal handlers return void.

diff --git a/include/os.h b/include/os.h
index 7da31a5..bda7125 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 66957d5..78a50b2 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;
commit aa6fbc2a3679896181610aee7ce2844d4322a5ce
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Apr 6 10:58:47 2009 -0400

    Remove some OS/2 leftovers.

diff --git a/hw/xfree86/common/modeline2c.awk b/hw/xfree86/common/modeline2c.awk
index 71a956e..038e7e9 100644
--- a/hw/xfree86/common/modeline2c.awk
+++ b/hw/xfree86/common/modeline2c.awk
@@ -56,9 +56,6 @@ BEGIN {
 	print "#include <xorg-config.h>"
 	print "#endif"
 	print ""
-	print "#ifdef __UNIXOS2__"
-	print "#define I_NEED_OS2_H"
-	print "#endif"
 	print "#include \"xf86.h\""
 	print "#include \"xf86Config.h\""
 	print "#include \"xf86Priv.h\""
diff --git a/os/connection.c b/os/connection.c
index a6270b3..0c72b67 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -345,15 +345,6 @@ InitParentProcess(void)
 	RunFromSmartParent = TRUE;
     OsSignal(SIGUSR1, handler);
     ParentProcess = getppid ();
-#ifdef __UNIXOS2__
-    /*
-     * fg030505: under OS/2, xinit is not the parent process but
-     * the "grant parent" process of the server because execvpe()
-     * presents us an additional process number;
-     * GetPPID(pid) is part of libemxfix
-     */
-    ParentProcess = GetPPID (ParentProcess);
-#endif /* __UNIXOS2__ */
 #endif
 }