Darwin: Cleaned up includes

I cleaned up the #includes a bit to make sure all the source files properly included xorg-config.h
Only quartzStartup.c and darwinKeyboard.c do not include it.  I ran into some weird crashes when they did which I'm looking into...

hw/darwin/darwin.c

@@ -29,7 +29,9 @@
  * use or other dealings in this Software without prior written authorization.
  */
 
-#include <dix-config.h>
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
 
 #include <X11/X.h>
 #include <X11/Xproto.h>

hw/darwin/darwin.h

@@ -27,9 +27,6 @@
 #ifndef _DARWIN_H
 #define _DARWIN_H
 
-//#include "dix-config.h" // This crashes us for some reason...
-#define SHAPE
-
 #include <IOKit/IOTypes.h>
 #include "inputstr.h"
 #include "scrnintstr.h"

hw/darwin/darwinEvents.c

@@ -30,6 +30,10 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  */
 
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
 #define NEED_EVENTS
 #include   <X11/X.h>
 #include   <X11/Xmd.h>

hw/darwin/darwinKeyboard.c

@@ -56,9 +56,14 @@
 ===========================================================================
 */
 
+// Including this crashes us... why?
+// #ifdef HAVE_XORG_CONFIG_H
+// #include <xorg-config.h>
+// #endif
+
 // Define this to get a diagnostic output to stderr which is helpful
 // in determining how the X server is interpreting the Darwin keymap.
-#define DUMP_DARWIN_KEYMAP
+// #define DUMP_DARWIN_KEYMAP
 
 #include <stdio.h>
 #include <stdlib.h>

hw/darwin/darwinXinput.c

@@ -52,6 +52,10 @@ SOFTWARE.
 
 ********************************************************/
 
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
 #define	 NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>

hw/darwin/quartz/X11Application.m

@@ -27,6 +27,10 @@
  promote the sale, use or other dealings in this Software without
  prior written authorization. */
 
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
 #include "quartzCommon.h"
 
 #import "X11Application.h"

hw/darwin/quartz/X11Controller.m

@@ -27,6 +27,10 @@
    promote the sale, use or other dealings in this Software without
    prior written authorization. */
 
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
 #define DEFAULT_PATH "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/X11/bin"
 
 #include "quartzCommon.h"

hw/darwin/quartz/applewm.c

@@ -24,9 +24,11 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
+
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
+
 #include "quartzCommon.h"
 
 #define NEED_REPLIES

hw/darwin/quartz/cr/XView.m

@@ -33,6 +33,7 @@
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
+
 #import "XView.h"
 
 

hw/darwin/quartz/cr/crAppleWM.m

@@ -29,6 +29,7 @@
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
+
 #include "quartz/quartzCommon.h"
 #include "quartz/cr/cr.h"
 

hw/darwin/quartz/cr/crFrame.m

@@ -30,6 +30,7 @@
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
+
 #include "quartz/quartzCommon.h"
 #include "quartz/cr/cr.h"
 

hw/darwin/quartz/cr/crScreen.m

@@ -30,6 +30,7 @@
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
+
 #include "quartz/quartzCommon.h"
 #include "quartz/cr/cr.h"
 

hw/darwin/quartz/fullscreen/fullscreen.c

@@ -29,6 +29,7 @@
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
+
 #include "quartz/quartzCommon.h"
 #include "darwin.h"
 #include "quartz/quartz.h"

hw/darwin/quartz/fullscreen/quartzCursor.c

@@ -31,6 +31,7 @@
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
+
 #include "quartz/quartzCommon.h"
 #include "quartz/quartzCursor.h"
 #include "darwin.h"

hw/darwin/quartz/pseudoramiX.c

@@ -33,10 +33,11 @@ dealings in this Software without prior written authorization from Digital
 Equipment Corporation.
 ******************************************************************/
 
-#include "pseudoramiX.h"
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
+
+#include "pseudoramiX.h"
 #include "extnsionst.h"
 #include "dixstruct.h"
 #include "window.h"

hw/darwin/quartz/quartz.c

@@ -31,6 +31,7 @@
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
+
 #include "quartzCommon.h"
 #include "quartz.h"
 #include "darwin.h"

hw/darwin/quartz/quartzAudio.c

@@ -39,6 +39,7 @@
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
+
 #include "quartzCommon.h"
 #include "quartzAudio.h"
 

hw/darwin/quartz/quartzCursor.c

@@ -31,6 +31,7 @@
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
+
 #include "quartzCommon.h"
 #include "quartzCursor.h"
 #include "darwin.h"

hw/darwin/quartz/quartzPasteboard.c

@@ -33,6 +33,7 @@
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
+
 #include "quartzPasteboard.h"
 
 #include <X11/Xatom.h>

hw/darwin/quartz/quartzStartup.c

@@ -27,6 +27,11 @@
  * use or other dealings in this Software without prior written authorization.
  */
 
+// Including this crashes us... why?
+// #ifdef HAVE_XORG_CONFIG_H
+// #include <xorg-config.h>
+// #endif
+
 #include <fcntl.h>
 #include <unistd.h>
 #include <CoreFoundation/CoreFoundation.h>

hw/darwin/quartz/xpr/appledri.c

@@ -38,6 +38,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
+
 #define NEED_REPLIES
 #define NEED_EVENTS
 #include <X11/X.h>

hw/darwin/quartz/xpr/dri.c

@@ -34,8 +34,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
 
-#include <dix-config.h>
-
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif