xserver: Branch 'xorg-server-1.4-apple' - 2 commits

[Jeremy Huddleston]

 configure.ac                          |    2 +-
 hw/xquartz/mach-startup/bundle-main.c |    5 +++++
 hw/xquartz/pseudoramiX.c              |    4 ----
 hw/xquartz/quartzCocoa.m              |    4 ----
 4 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit f5e399e995aaef5874a31b30d67e521d4c9ffad9
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Wed Jun 25 11:51:56 2008 -0700

    1.4.2-apple2

diff --git a/configure.ac b/configure.ac
index 9cf44af..e7a4c5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.4.2-apple1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.4.2-apple2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
commit 49668e8a88137e9f258eae970826883b88b7d8ba
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Wed Jun 25 11:51:27 2008 -0700

    XQuartz: Set noPanoramixExtension earlier to avoid a possible race.

diff --git a/hw/xquartz/mach-startup/bundle-main.c b/hw/xquartz/mach-startup/bundle-main.c
index d2bc9d3..de92361 100644
--- a/hw/xquartz/mach-startup/bundle-main.c
+++ b/hw/xquartz/mach-startup/bundle-main.c
@@ -51,6 +51,8 @@
 /* From darwinEvents.c ... but don't want to pull in all the server cruft */
 void DarwinListenOnOpenFD(int fd);
 
+extern int noPanoramiXExtension;
+
 #define DEFAULT_CLIENT "/usr/X11/bin/xterm"
 #define DEFAULT_STARTX "/usr/X11/bin/startx"
 #define DEFAULT_SHELL  "/bin/sh"
@@ -359,6 +361,9 @@ int main(int argc, char **argv, char **envp) {
     mach_msg_size_t mxmsgsz = sizeof(union MaxMsgSize) + MAX_TRAILER_SIZE;
     mach_port_t mp;
     kern_return_t kr;
+
+    // The server must not run the PanoramiX operations.
+    noPanoramiXExtension = TRUE;
     
     fprintf(stderr, "X11.app: main(): argc=%d\n", argc);
     for(i=1; i < argc; i++) {
diff --git a/hw/xquartz/pseudoramiX.c b/hw/xquartz/pseudoramiX.c
index 2083f60..9ad3329 100644
--- a/hw/xquartz/pseudoramiX.c
+++ b/hw/xquartz/pseudoramiX.c
@@ -46,7 +46,6 @@ Equipment Corporation.
 #include "globals.h"
 
 Bool noPseudoramiXExtension = FALSE;
-extern int noPanoramiXExtension;
 
 extern int ProcPanoramiXQueryVersion (ClientPtr client);
 
@@ -131,9 +130,6 @@ void PseudoramiXExtensionInit(int argc, char *argv[])
     }
 #endif
 
-    // The server must not run the PanoramiX operations.
-    noPanoramiXExtension = TRUE;
-
     if (pseudoramiXGeneration != serverGeneration) {
         extEntry = AddExtension(PANORAMIX_PROTOCOL_NAME, 0, 0,
                                 ProcPseudoramiXDispatch,
diff --git a/hw/xquartz/quartzCocoa.m b/hw/xquartz/quartzCocoa.m
index 2890d34..0ab9493 100644
--- a/hw/xquartz/quartzCocoa.m
+++ b/hw/xquartz/quartzCocoa.m
@@ -44,10 +44,6 @@
 
 #include "darwin.h"
 
-extern void FatalError(const char *, ...);
-extern char *display;
-extern int noPanoramiXExtension;
-
 /*
  * QuartzWriteCocoaPasteboard
  *  Write text to the Mac OS X pasteboard.