xserver: Branch 'xorg-server-1.2-apple'

[Jeremy Huddleston]

 hw/darwin/Makefile.am            |    1 +
 hw/darwin/darwin.c               |    2 --
 hw/darwin/darwin.h               |    2 +-
 hw/darwin/quartz/xpr/Makefile.am |    2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 165ab0af3aefcc5dc039d49e00dcdfe41e2897a3
Author: Jeremy Huddleston <jeremy at tifa.local>
Date:   Thu Nov 22 02:16:16 2007 -0800

    Darwin: Further cleanup to line up to master

diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am
index e21a045..f4bb6b0 100644
--- a/hw/darwin/Makefile.am
+++ b/hw/darwin/Makefile.am
@@ -88,6 +88,7 @@ x11launcher-clean:
 
 install-data-hook: x11app-install x11launcher-install
 clean-local: x11app-clean x11launcher-clean
+
 endif
 
 EXTRA_DIST = \
diff --git a/hw/darwin/darwin.c b/hw/darwin/darwin.c
index c721ca1..3eca65f 100644
--- a/hw/darwin/darwin.c
+++ b/hw/darwin/darwin.c
@@ -3,8 +3,6 @@
  * Shared code for the Darwin X Server
  * running with Quartz or IOKit display mode
  *
- **************************************************************/
-/*
  * Copyright (c) 2001-2004 Torrey T. Lyons. All Rights Reserved.
  * Copyright (c) 2007 Apple Inc.
  *
diff --git a/hw/darwin/darwin.h b/hw/darwin/darwin.h
index 14443b9..ef0a922 100644
--- a/hw/darwin/darwin.h
+++ b/hw/darwin/darwin.h
@@ -48,7 +48,7 @@ typedef struct {
 
 
 // From darwin.c
-void DarwinPrintBanner();
+void DarwinPrintBanner(void);
 int DarwinParseModifierList(const char *constmodifiers);
 void DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo);
 void xf86SetRootClip (ScreenPtr pScreen, BOOL enable);
diff --git a/hw/darwin/quartz/xpr/Makefile.am b/hw/darwin/quartz/xpr/Makefile.am
index 67c8339..d45c071 100644
--- a/hw/darwin/quartz/xpr/Makefile.am
+++ b/hw/darwin/quartz/xpr/Makefile.am
@@ -1,5 +1,5 @@
 noinst_LIBRARIES = libxpr.a
-AM_CFLAGS =  $(XORG_CFLAGS) $(PIXMAN_CFLAGS)
+AM_CFLAGS =  $(XORG_CFLAGS)
 AM_CPPFLAGS = $(XORG_INCS) \
 	-DHAVE_XORG_CONFIG_H \
 	-I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. \