From c140d20f4ade973496dcbbd06453402ef0c0e85c Mon Sep 17 00:00:00 2001 From: Ben Byer Date: Wed, 19 Sep 2007 05:58:22 -0700 Subject: [PATCH] XDarwin: mass change from using xorg-config.h to dix-config.h cuz we're not using the X.org ddx anymore --- hw/darwin/darwin.c | 4 +--- hw/darwin/iokit/xfIOKit.c | 4 +--- hw/darwin/iokit/xfIOKitCursor.c | 5 ++--- hw/darwin/iokit/xfIOKitStartup.c | 5 +---- hw/darwin/quartz/Preferences.m | 6 +++--- hw/darwin/quartz/XServer.m | 6 ++---- hw/darwin/quartz/applewm.c | 6 +++--- hw/darwin/quartz/cr/XView.m | 7 +++---- hw/darwin/quartz/cr/crAppleWM.m | 6 +++--- hw/darwin/quartz/cr/crFrame.m | 7 +++---- hw/darwin/quartz/cr/crScreen.m | 6 +++--- hw/darwin/quartz/fullscreen/fullscreen.c | 6 +++--- hw/darwin/quartz/fullscreen/quartzCursor.c | 6 +++--- hw/darwin/quartz/pseudoramiX.c | 6 +++--- hw/darwin/quartz/quartz.c | 6 +++--- hw/darwin/quartz/quartzAudio.c | 6 +++--- hw/darwin/quartz/quartzCocoa.m | 4 +--- hw/darwin/quartz/quartzCursor.c | 5 ++--- hw/darwin/quartz/quartzKeyboard.c | 6 ++---- hw/darwin/quartz/quartzPasteboard.c | 6 ++---- hw/darwin/quartz/xpr/appledri.c | 5 ++--- hw/darwin/quartz/xpr/dri.c | 5 ++--- hw/darwin/quartz/xpr/x-hash.c | 6 +++--- hw/darwin/quartz/xpr/x-hook.c | 6 +++--- hw/darwin/quartz/xpr/x-list.c | 6 +++--- hw/darwin/quartz/xpr/xprAppleWM.c | 6 +++--- hw/darwin/quartz/xpr/xprCursor.c | 6 +++--- hw/darwin/quartz/xpr/xprFrame.c | 6 +++--- hw/darwin/quartz/xpr/xprScreen.c | 6 +++--- 29 files changed, 72 insertions(+), 93 deletions(-) diff --git a/hw/darwin/darwin.c b/hw/darwin/darwin.c index 0b22141b53..1c18cd2ac2 100644 --- a/hw/darwin/darwin.c +++ b/hw/darwin/darwin.c @@ -31,9 +31,7 @@ * use or other dealings in this Software without prior written authorization. */ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif +#include #include #include diff --git a/hw/darwin/iokit/xfIOKit.c b/hw/darwin/iokit/xfIOKit.c index 9de33c0645..0feb8ccb0c 100644 --- a/hw/darwin/iokit/xfIOKit.c +++ b/hw/darwin/iokit/xfIOKit.c @@ -34,9 +34,7 @@ * use or other dealings in this Software without prior written authorization. */ -#if HAVE_XORG_CONFIG_H -#include -#endif +#include #include #include diff --git a/hw/darwin/iokit/xfIOKitCursor.c b/hw/darwin/iokit/xfIOKitCursor.c index 8388513a32..e9c78c1303 100644 --- a/hw/darwin/iokit/xfIOKitCursor.c +++ b/hw/darwin/iokit/xfIOKitCursor.c @@ -58,9 +58,8 @@ * use or other dealings in this Software without prior written authorization. */ -#if HAVE_XORG_CONFIG_H -#include -#endif +#include + #include "scrnintstr.h" #include "cursorstr.h" #include "mipointrst.h" diff --git a/hw/darwin/iokit/xfIOKitStartup.c b/hw/darwin/iokit/xfIOKitStartup.c index 07e8c2181e..ad8e05b56a 100644 --- a/hw/darwin/iokit/xfIOKitStartup.c +++ b/hw/darwin/iokit/xfIOKitStartup.c @@ -29,10 +29,7 @@ * use or other dealings in this Software without prior written authorization. */ - -#if HAVE_XORG_CONFIG_H -#include -#endif +#include #include "darwin.h" #include "darwinKeyboard.h" diff --git a/hw/darwin/quartz/Preferences.m b/hw/darwin/quartz/Preferences.m index a79454b13f..6fca3b655c 100644 --- a/hw/darwin/quartz/Preferences.m +++ b/hw/darwin/quartz/Preferences.m @@ -31,9 +31,9 @@ * authorization. */ /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/Preferences.m,v 1.5 2004/06/08 22:58:10 torrey Exp $ */ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif + +#include + #import "quartzCommon.h" #define BOOL xBOOL diff --git a/hw/darwin/quartz/XServer.m b/hw/darwin/quartz/XServer.m index 32bfbf58f9..14776f8888 100644 --- a/hw/darwin/quartz/XServer.m +++ b/hw/darwin/quartz/XServer.m @@ -35,10 +35,8 @@ * authorization. */ /* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/XServer.m,v 1.3 2004/07/30 19:12:17 torrey Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.m,v 1.19 2003/11/24 05:39:01 torrey Exp $ */ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif + +#include #include "quartzCommon.h" #define BOOL xBOOL diff --git a/hw/darwin/quartz/applewm.c b/hw/darwin/quartz/applewm.c index cc11cfa4c5..d3c26ed280 100644 --- a/hw/darwin/quartz/applewm.c +++ b/hw/darwin/quartz/applewm.c @@ -24,9 +24,9 @@ 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 -#endif + +#include + #include "quartzCommon.h" #define NEED_REPLIES diff --git a/hw/darwin/quartz/cr/XView.m b/hw/darwin/quartz/cr/XView.m index 8bcd1a76f4..0cea250bbb 100644 --- a/hw/darwin/quartz/cr/XView.m +++ b/hw/darwin/quartz/cr/XView.m @@ -30,11 +30,10 @@ * use or other dealings in this Software without prior written authorization. */ /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/XView.m,v 1.1 2003/06/07 05:49:07 torrey Exp $ */ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif -#import "XView.h" +#include + +#import "XView.h" @implementation XView diff --git a/hw/darwin/quartz/cr/crAppleWM.m b/hw/darwin/quartz/cr/crAppleWM.m index 0741d4e58b..a583581dc1 100644 --- a/hw/darwin/quartz/cr/crAppleWM.m +++ b/hw/darwin/quartz/cr/crAppleWM.m @@ -27,9 +27,9 @@ * use or other dealings in this Software without prior written authorization. */ /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif + +#include + #include "quartz/quartzCommon.h" #include "quartz/cr/cr.h" diff --git a/hw/darwin/quartz/cr/crFrame.m b/hw/darwin/quartz/cr/crFrame.m index 2b8e57d0ad..3c1f0bb288 100644 --- a/hw/darwin/quartz/cr/crFrame.m +++ b/hw/darwin/quartz/cr/crFrame.m @@ -28,10 +28,9 @@ * use or other dealings in this Software without prior written authorization. */ /* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.2 2004/04/23 19:15:51 eich Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.9 2004/03/19 02:05:29 torrey Exp $ */ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif + +#include + #include "quartz/quartzCommon.h" #include "quartz/cr/cr.h" diff --git a/hw/darwin/quartz/cr/crScreen.m b/hw/darwin/quartz/cr/crScreen.m index 9dd130e01e..8c0966578a 100644 --- a/hw/darwin/quartz/cr/crScreen.m +++ b/hw/darwin/quartz/cr/crScreen.m @@ -29,9 +29,9 @@ * use or other dealings in this Software without prior written authorization. */ /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crScreen.m,v 1.5 2003/11/12 20:21:52 torrey Exp $ */ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif + +#include + #include "quartz/quartzCommon.h" #include "quartz/cr/cr.h" diff --git a/hw/darwin/quartz/fullscreen/fullscreen.c b/hw/darwin/quartz/fullscreen/fullscreen.c index 02f6e89a8b..2021ea2d37 100644 --- a/hw/darwin/quartz/fullscreen/fullscreen.c +++ b/hw/darwin/quartz/fullscreen/fullscreen.c @@ -25,9 +25,9 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif + +#include + #include "quartz/quartzCommon.h" #include "darwin.h" #include "quartz/quartz.h" diff --git a/hw/darwin/quartz/fullscreen/quartzCursor.c b/hw/darwin/quartz/fullscreen/quartzCursor.c index 77fa008f2d..a97a36d88d 100644 --- a/hw/darwin/quartz/fullscreen/quartzCursor.c +++ b/hw/darwin/quartz/fullscreen/quartzCursor.c @@ -29,9 +29,9 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif + +#include + #include "quartz/quartzCommon.h" #include "quartz/quartzCursor.h" #include "darwin.h" diff --git a/hw/darwin/quartz/pseudoramiX.c b/hw/darwin/quartz/pseudoramiX.c index e65be69a01..787601b5dd 100644 --- a/hw/darwin/quartz/pseudoramiX.c +++ b/hw/darwin/quartz/pseudoramiX.c @@ -34,9 +34,9 @@ Equipment Corporation. ******************************************************************/ #include "pseudoramiX.h" -#ifdef HAVE_XORG_CONFIG_H -#include -#endif + +#include + #include "extnsionst.h" #include "dixstruct.h" #include "window.h" diff --git a/hw/darwin/quartz/quartz.c b/hw/darwin/quartz/quartz.c index b309b7b2c1..374f365f2e 100644 --- a/hw/darwin/quartz/quartz.c +++ b/hw/darwin/quartz/quartz.c @@ -29,9 +29,9 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif + +#include + #include "quartzCommon.h" #include "quartz.h" #include "darwin.h" diff --git a/hw/darwin/quartz/quartzAudio.c b/hw/darwin/quartz/quartzAudio.c index 16b9c2ba8a..8a337daba8 100644 --- a/hw/darwin/quartz/quartzAudio.c +++ b/hw/darwin/quartz/quartzAudio.c @@ -35,9 +35,9 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif + +#include + #include "quartzCommon.h" #include "quartzAudio.h" diff --git a/hw/darwin/quartz/quartzCocoa.m b/hw/darwin/quartz/quartzCocoa.m index 42eabcbae2..5bc1501a65 100644 --- a/hw/darwin/quartz/quartzCocoa.m +++ b/hw/darwin/quartz/quartzCocoa.m @@ -35,9 +35,7 @@ * use or other dealings in this Software without prior written authorization. */ /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCocoa.m,v 1.5 2004/06/08 22:58:10 torrey Exp $ */ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif +#include #include "quartzCommon.h" diff --git a/hw/darwin/quartz/quartzCursor.c b/hw/darwin/quartz/quartzCursor.c index 6ed6a76773..0fa04e6778 100644 --- a/hw/darwin/quartz/quartzCursor.c +++ b/hw/darwin/quartz/quartzCursor.c @@ -30,9 +30,8 @@ * use or other dealings in this Software without prior written authorization. */ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif +#include + #include "quartzCommon.h" #include "quartzCursor.h" #include "darwin.h" diff --git a/hw/darwin/quartz/quartzKeyboard.c b/hw/darwin/quartz/quartzKeyboard.c index bdd541663f..b498c77880 100644 --- a/hw/darwin/quartz/quartzKeyboard.c +++ b/hw/darwin/quartz/quartzKeyboard.c @@ -32,11 +32,9 @@ prior written authorization. */ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif -#include "quartzCommon.h" +#include +#include "quartzCommon.h" #include #include diff --git a/hw/darwin/quartz/quartzPasteboard.c b/hw/darwin/quartz/quartzPasteboard.c index a3536fc561..af25fc892e 100644 --- a/hw/darwin/quartz/quartzPasteboard.c +++ b/hw/darwin/quartz/quartzPasteboard.c @@ -30,11 +30,9 @@ * use or other dealings in this Software without prior written authorization. */ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif -#include "quartzPasteboard.h" +#include +#include "quartzPasteboard.h" #include #include "windowstr.h" #include "propertyst.h" diff --git a/hw/darwin/quartz/xpr/appledri.c b/hw/darwin/quartz/xpr/appledri.c index ef68c867b3..70b7400773 100644 --- a/hw/darwin/quartz/xpr/appledri.c +++ b/hw/darwin/quartz/xpr/appledri.c @@ -35,9 +35,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif +#include + #define NEED_REPLIES #define NEED_EVENTS #include diff --git a/hw/darwin/quartz/xpr/dri.c b/hw/darwin/quartz/xpr/dri.c index 08ee382210..acc1f45f77 100644 --- a/hw/darwin/quartz/xpr/dri.c +++ b/hw/darwin/quartz/xpr/dri.c @@ -33,9 +33,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * Rickard E. (Rik) Faith * */ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif + +#include #include #include diff --git a/hw/darwin/quartz/xpr/x-hash.c b/hw/darwin/quartz/xpr/x-hash.c index 6bbeacfab8..d24e05c1f6 100644 --- a/hw/darwin/quartz/xpr/x-hash.c +++ b/hw/darwin/quartz/xpr/x-hash.c @@ -26,9 +26,9 @@ copyright holders shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization. */ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif + +#include + #include "x-hash.h" #include "x-list.h" #include diff --git a/hw/darwin/quartz/xpr/x-hook.c b/hw/darwin/quartz/xpr/x-hook.c index 42915db6f3..92c174e0b8 100644 --- a/hw/darwin/quartz/xpr/x-hook.c +++ b/hw/darwin/quartz/xpr/x-hook.c @@ -26,9 +26,9 @@ copyright holders shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization. */ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif + +#include + #include "x-hook.h" #include #include diff --git a/hw/darwin/quartz/xpr/x-list.c b/hw/darwin/quartz/xpr/x-list.c index a5f835d849..356bb79a47 100644 --- a/hw/darwin/quartz/xpr/x-list.c +++ b/hw/darwin/quartz/xpr/x-list.c @@ -26,9 +26,9 @@ copyright holders shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization. */ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif + +#include + #include "x-list.h" #include #include diff --git a/hw/darwin/quartz/xpr/xprAppleWM.c b/hw/darwin/quartz/xpr/xprAppleWM.c index fdf404c2d6..1573d215b3 100644 --- a/hw/darwin/quartz/xpr/xprAppleWM.c +++ b/hw/darwin/quartz/xpr/xprAppleWM.c @@ -27,9 +27,9 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif + +#include + #include "xpr.h" #include "quartz/applewmExt.h" #include "rootless.h" diff --git a/hw/darwin/quartz/xpr/xprCursor.c b/hw/darwin/quartz/xpr/xprCursor.c index e7f23b78bf..d5a1180612 100644 --- a/hw/darwin/quartz/xpr/xprCursor.c +++ b/hw/darwin/quartz/xpr/xprCursor.c @@ -30,9 +30,9 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif + +#include + #include "quartz/quartzCommon.h" #include "xpr.h" #include "darwin.h" diff --git a/hw/darwin/quartz/xpr/xprFrame.c b/hw/darwin/quartz/xpr/xprFrame.c index b71b2a606b..76c719ec0e 100644 --- a/hw/darwin/quartz/xpr/xprFrame.c +++ b/hw/darwin/quartz/xpr/xprFrame.c @@ -27,9 +27,9 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif + +#include + #include "xpr.h" #include "rootlessCommon.h" #include "Xplugin.h" diff --git a/hw/darwin/quartz/xpr/xprScreen.c b/hw/darwin/quartz/xpr/xprScreen.c index 034cbac6d8..b0ddece3ff 100644 --- a/hw/darwin/quartz/xpr/xprScreen.c +++ b/hw/darwin/quartz/xpr/xprScreen.c @@ -27,9 +27,9 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif + +#include + #include "quartz/quartzCommon.h" #include "quartz/quartz.h" #include "xpr.h"