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

[Jeremy Huddleston]

 GL/apple/Makefile.am |    4 ++--
 configure.ac         |    2 +-
 hw/xquartz/darwin.h  |    6 ------
 3 files changed, 3 insertions(+), 9 deletions(-)

New commits:
commit be590129210d93a73180475d2756b3fa971b3af3
Author: Ben Byer <bbyer at bbyer.local>
Date:   Fri Dec 7 01:51:53 2007 -0800

    fixed pathname in GL/apple/Makefile.am
    (cherry picked from commit b6357cec6d837226009c0d2b69026027da36656e)

diff --git a/GL/apple/Makefile.am b/GL/apple/Makefile.am
index f1e02cc..7ad9140 100644
--- a/GL/apple/Makefile.am
+++ b/GL/apple/Makefile.am
@@ -4,8 +4,8 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/GL/glx \
 	-I$(top_srcdir)/GL/include \
 	-I$(top_srcdir)/GL/mesa/glapi \
-	-I$(top_srcdir)/hw/darwin/quartz \
-	-I$(top_srcdir)/hw/darwin/quartz/xpr \
+	-I$(top_srcdir)/hw/xquartz \
+	-I$(top_srcdir)/hw/xquartz/xpr \
 	-I$(top_srcdir)/miext/damage
 
 noinst_LIBRARIES = libCGLcore.a 
commit dc56305e16e776c947747403f8ee472ec7b76b0a
Author: Ben Byer <bbyer at bbyer.apple.com>
Date:   Thu Dec 6 20:51:32 2007 -0800

    ALLOCATE_LOCAL is dangerous on Darwin due to memory layout differences
    from Linux, so let's define NO_ALLOCA.
    (cherry picked from commit 7caf51d1a5a86ae884e0087795636222c082962c)

diff --git a/configure.ac b/configure.ac
index 62fd4a9..1df3745 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1748,7 +1748,7 @@ if test "x$XQUARTZ" = xyes; then
 	       AC_SUBST([DARWIN_LIBS])
                AC_CHECK_LIB([Xplugin],[xp_init],[:])
                AC_SUBST([APPLE_APPLICATIONS_DIR])
-               CFLAGS="${CFLAGS} -D__DARWIN__ -DROOTLESS_WORKAROUND"
+               CFLAGS="${CFLAGS} -D__DARWIN__ -DROOTLESS_WORKAROUND -DNO_ALLOCA"
                PLIST_VERSION_STRING=$PACKAGE_VERSION
                AC_SUBST([PLIST_VERSION_STRING])
                PLIST_VENDOR_WEB=$VENDOR_WEB
commit 06c46ec050c97cc395af9e11520f2b0488ac4354
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date:   Wed Dec 5 21:36:34 2007 -0800

    Darwin: Dead coded removal
    Kill off assert macro
    (cherry picked from commit d6493abedb2caf03b2bc3a6440b637df67eff081)

diff --git a/hw/xquartz/darwin.h b/hw/xquartz/darwin.h
index a332229..f835ae0 100644
--- a/hw/xquartz/darwin.h
+++ b/hw/xquartz/darwin.h
@@ -52,12 +52,6 @@ int DarwinParseModifierList(const char *constmodifiers);
 void DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo);
 void xf86SetRootClip (ScreenPtr pScreen, BOOL enable);
 
-#undef assert
-#define assert(x) { if ((x) == 0) \
-    FatalError("assert failed on line %d of %s!\n", __LINE__, __FILE__); }
-#define kern_assert(x) { if ((x) != KERN_SUCCESS) \
-    FatalError("assert failed on line %d of %s with kernel return 0x%x!\n", \
-                __LINE__, __FILE__, x); }
 #define SCREEN_PRIV(pScreen) \
     ((DarwinFramebufferPtr)pScreen->devPrivates[darwinScreenIndex].ptr)