Darwin: Further cleanup to line up to master

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 = \

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.
  *

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);

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)/../.. \