frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XDarwin: mass change from using xorg-config.h to dix-config.h cuz we're not using the X.org ddx anymore

This commit is contained in:
Ben Byer 2007-09-19 05:58:22 -07:00
parent bcb5e3e627
commit c140d20f4a
29 changed files with 72 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/darwin/darwin.c
View File

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

4
hw/darwin/iokit/xfIOKit.c
View File

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

5
hw/darwin/iokit/xfIOKitCursor.c
View File

@ -58,9 +58,8 @@
* use or other dealings in this Software without prior written authorization. * use or other dealings in this Software without prior written authorization.
*/ */
#if HAVE_XORG_CONFIG_H #include <dix-config.h>
#include <xorg-config.h>
#endif
#include "scrnintstr.h" #include "scrnintstr.h"
#include "cursorstr.h" #include "cursorstr.h"
#include "mipointrst.h" #include "mipointrst.h"

5
hw/darwin/iokit/xfIOKitStartup.c
View File

@ -29,10 +29,7 @@
* use or other dealings in this Software without prior written authorization. * use or other dealings in this Software without prior written authorization.
*/ */
#include <dix-config.h>
#if HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#include "darwin.h" #include "darwin.h"
#include "darwinKeyboard.h" #include "darwinKeyboard.h"

6
hw/darwin/quartz/Preferences.m
View File

@ -31,9 +31,9 @@
* authorization. * authorization.
*/ */
/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/Preferences.m,v 1.5 2004/06/08 22:58:10 torrey Exp $ */ /* $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 <xorg-config.h> #include <dix-config.h>
#endif
#import "quartzCommon.h" #import "quartzCommon.h"
#define BOOL xBOOL #define BOOL xBOOL

6
hw/darwin/quartz/XServer.m
View File

@ -35,10 +35,8 @@
* authorization. * authorization.
*/ */
/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/XServer.m,v 1.3 2004/07/30 19:12:17 torrey Exp $ */ /* $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 <dix-config.h>
#include <xorg-config.h>
#endif
#include "quartzCommon.h" #include "quartzCommon.h"
#define BOOL xBOOL #define BOOL xBOOL

6
hw/darwin/quartz/applewm.c
View File

@ -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. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/ **************************************************************************/
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <dix-config.h>
#endif
#include "quartzCommon.h" #include "quartzCommon.h"
#define NEED_REPLIES #define NEED_REPLIES

7
hw/darwin/quartz/cr/XView.m
View File

@ -30,11 +30,10 @@
* use or other dealings in this Software without prior written authorization. * 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 $ */ /* $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 <xorg-config.h>
#endif
#import "XView.h"
#include <dix-config.h>
#import "XView.h"
@implementation XView @implementation XView

6
hw/darwin/quartz/cr/crAppleWM.m
View File

@ -27,9 +27,9 @@
* use or other dealings in this Software without prior written authorization. * 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 $ */ /* $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 <xorg-config.h> #include <dix-config.h>
#endif
#include "quartz/quartzCommon.h" #include "quartz/quartzCommon.h"
#include "quartz/cr/cr.h" #include "quartz/cr/cr.h"

7
hw/darwin/quartz/cr/crFrame.m
View File

@ -28,10 +28,9 @@
* use or other dealings in this Software without prior written authorization. * 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 $ */ /* $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 <dix-config.h>
#include <xorg-config.h>
#endif
#include "quartz/quartzCommon.h" #include "quartz/quartzCommon.h"
#include "quartz/cr/cr.h" #include "quartz/cr/cr.h"

6
hw/darwin/quartz/cr/crScreen.m
View File

@ -29,9 +29,9 @@
* use or other dealings in this Software without prior written authorization. * 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 $ */ /* $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 <xorg-config.h> #include <dix-config.h>
#endif
#include "quartz/quartzCommon.h" #include "quartz/quartzCommon.h"
#include "quartz/cr/cr.h" #include "quartz/cr/cr.h"

6
hw/darwin/quartz/fullscreen/fullscreen.c
View File

@ -25,9 +25,9 @@
* holders shall not be used in advertising or otherwise to promote the sale, * holders shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in this Software without prior written authorization. * use or other dealings in this Software without prior written authorization.
*/ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <dix-config.h>
#endif
#include "quartz/quartzCommon.h" #include "quartz/quartzCommon.h"
#include "darwin.h" #include "darwin.h"
#include "quartz/quartz.h" #include "quartz/quartz.h"

6
hw/darwin/quartz/fullscreen/quartzCursor.c
View File

@ -29,9 +29,9 @@
* holders shall not be used in advertising or otherwise to promote the sale, * holders shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in this Software without prior written authorization. * use or other dealings in this Software without prior written authorization.
*/ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <dix-config.h>
#endif
#include "quartz/quartzCommon.h" #include "quartz/quartzCommon.h"
#include "quartz/quartzCursor.h" #include "quartz/quartzCursor.h"
#include "darwin.h" #include "darwin.h"

6
hw/darwin/quartz/pseudoramiX.c
View File

@ -34,9 +34,9 @@ Equipment Corporation.
******************************************************************/ ******************************************************************/
#include "pseudoramiX.h" #include "pseudoramiX.h"
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <dix-config.h>
#endif
#include "extnsionst.h" #include "extnsionst.h"
#include "dixstruct.h" #include "dixstruct.h"
#include "window.h" #include "window.h"

6
hw/darwin/quartz/quartz.c
View File

@ -29,9 +29,9 @@
* holders shall not be used in advertising or otherwise to promote the sale, * holders shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in this Software without prior written authorization. * use or other dealings in this Software without prior written authorization.
*/ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <dix-config.h>
#endif
#include "quartzCommon.h" #include "quartzCommon.h"
#include "quartz.h" #include "quartz.h"
#include "darwin.h" #include "darwin.h"

6
hw/darwin/quartz/quartzAudio.c
View File

@ -35,9 +35,9 @@
* holders shall not be used in advertising or otherwise to promote the sale, * holders shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in this Software without prior written authorization. * use or other dealings in this Software without prior written authorization.
*/ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <dix-config.h>
#endif
#include "quartzCommon.h" #include "quartzCommon.h"
#include "quartzAudio.h" #include "quartzAudio.h"

4
hw/darwin/quartz/quartzCocoa.m
View File

@ -35,9 +35,7 @@
* use or other dealings in this Software without prior written authorization. * 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 $ */ /* $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 <dix-config.h>
#include <xorg-config.h>
#endif
#include "quartzCommon.h" #include "quartzCommon.h"

5
hw/darwin/quartz/quartzCursor.c
View File

@ -30,9 +30,8 @@
* use or other dealings in this Software without prior written authorization. * use or other dealings in this Software without prior written authorization.
*/ */
#ifdef HAVE_XORG_CONFIG_H #include <dix-config.h>
#include <xorg-config.h>
#endif
#include "quartzCommon.h" #include "quartzCommon.h"
#include "quartzCursor.h" #include "quartzCursor.h"
#include "darwin.h" #include "darwin.h"

6
hw/darwin/quartz/quartzKeyboard.c
View File

@ -32,11 +32,9 @@
prior written authorization. prior written authorization.
*/ */
#ifdef HAVE_XORG_CONFIG_H #include <dix-config.h>
#include <xorg-config.h>
#endif
#include "quartzCommon.h"
#include "quartzCommon.h"
#include <CoreServices/CoreServices.h> #include <CoreServices/CoreServices.h>
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>

6
hw/darwin/quartz/quartzPasteboard.c
View File

@ -30,11 +30,9 @@
* use or other dealings in this Software without prior written authorization. * use or other dealings in this Software without prior written authorization.
*/ */
#ifdef HAVE_XORG_CONFIG_H #include <dix-config.h>
#include <xorg-config.h>
#endif
#include "quartzPasteboard.h"
#include "quartzPasteboard.h"
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include "windowstr.h" #include "windowstr.h"
#include "propertyst.h" #include "propertyst.h"

5
hw/darwin/quartz/xpr/appledri.c
View File

@ -35,9 +35,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* *
*/ */
#ifdef HAVE_XORG_CONFIG_H #include <dix-config.h>
#include <xorg-config.h>
#endif
#define NEED_REPLIES #define NEED_REPLIES
#define NEED_EVENTS #define NEED_EVENTS
#include <X11/X.h> #include <X11/X.h>

5
hw/darwin/quartz/xpr/dri.c
View File

@ -33,9 +33,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* Rickard E. (Rik) Faith <faith@valinux.com> * Rickard E. (Rik) Faith <faith@valinux.com>
* *
*/ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <dix-config.h>
#endif
#include <sys/time.h> #include <sys/time.h>
#include <unistd.h> #include <unistd.h>

6
hw/darwin/quartz/xpr/x-hash.c
View File

@ -26,9 +26,9 @@
copyright holders shall not be used in advertising or otherwise to copyright holders shall not be used in advertising or otherwise to
promote the sale, use or other dealings in this Software without promote the sale, use or other dealings in this Software without
prior written authorization. */ prior written authorization. */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <dix-config.h>
#endif
#include "x-hash.h" #include "x-hash.h"
#include "x-list.h" #include "x-list.h"
#include <stdlib.h> #include <stdlib.h>

6
hw/darwin/quartz/xpr/x-hook.c
View File

@ -26,9 +26,9 @@
copyright holders shall not be used in advertising or otherwise to copyright holders shall not be used in advertising or otherwise to
promote the sale, use or other dealings in this Software without promote the sale, use or other dealings in this Software without
prior written authorization. */ prior written authorization. */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <dix-config.h>
#endif
#include "x-hook.h" #include "x-hook.h"
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>

6
hw/darwin/quartz/xpr/x-list.c
View File

@ -26,9 +26,9 @@
copyright holders shall not be used in advertising or otherwise to copyright holders shall not be used in advertising or otherwise to
promote the sale, use or other dealings in this Software without promote the sale, use or other dealings in this Software without
prior written authorization. */ prior written authorization. */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <dix-config.h>
#endif
#include "x-list.h" #include "x-list.h"
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>

6
hw/darwin/quartz/xpr/xprAppleWM.c
View File

@ -27,9 +27,9 @@
* holders shall not be used in advertising or otherwise to promote the sale, * holders shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in this Software without prior written authorization. * use or other dealings in this Software without prior written authorization.
*/ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <dix-config.h>
#endif
#include "xpr.h" #include "xpr.h"
#include "quartz/applewmExt.h" #include "quartz/applewmExt.h"
#include "rootless.h" #include "rootless.h"

6
hw/darwin/quartz/xpr/xprCursor.c
View File

@ -30,9 +30,9 @@
* holders shall not be used in advertising or otherwise to promote the sale, * holders shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in this Software without prior written authorization. * use or other dealings in this Software without prior written authorization.
*/ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <dix-config.h>
#endif
#include "quartz/quartzCommon.h" #include "quartz/quartzCommon.h"
#include "xpr.h" #include "xpr.h"
#include "darwin.h" #include "darwin.h"

6
hw/darwin/quartz/xpr/xprFrame.c
View File

@ -27,9 +27,9 @@
* holders shall not be used in advertising or otherwise to promote the sale, * holders shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in this Software without prior written authorization. * use or other dealings in this Software without prior written authorization.
*/ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <dix-config.h>
#endif
#include "xpr.h" #include "xpr.h"
#include "rootlessCommon.h" #include "rootlessCommon.h"
#include "Xplugin.h" #include "Xplugin.h"

6
hw/darwin/quartz/xpr/xprScreen.c
View File

@ -27,9 +27,9 @@
* holders shall not be used in advertising or otherwise to promote the sale, * holders shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in this Software without prior written authorization. * use or other dealings in this Software without prior written authorization.
*/ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <dix-config.h>
#endif
#include "quartz/quartzCommon.h" #include "quartz/quartzCommon.h"
#include "quartz/quartz.h" #include "quartz/quartz.h"
#include "xpr.h" #include "xpr.h"