From d3f6b43a240eb763025b3cbf546cb7ae502c94fa Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 15 Jul 2009 16:51:05 +1000 Subject: Update to xextproto 7.0.99.1. xextproto had Xlib client headers moved into libXext. Protocol header files are named fooproto.h, header files with constants foo.h or fooconst.h where foo.h was already in use for client-side headers. --- hw/xfree86/common/xf86DPMS.c | 3 +-- hw/xfree86/common/xf86Events.c | 3 +-- hw/xfree86/common/xf86Init.c | 3 +-- hw/xfree86/common/xf86Xinput.c | 3 +-- hw/xfree86/dixmods/extmod/modinit.h | 14 +++++--------- hw/xfree86/fbdevhw/fbdevhw.c | 3 +-- hw/xfree86/modes/xf86Crtc.c | 3 +-- hw/xfree86/modes/xf86Cursors.c | 3 +-- hw/xfree86/modes/xf86Rotate.c | 3 +-- hw/xfree86/vbe/vbe.c | 3 +-- hw/xfree86/vgahw/vgaHW.h | 3 +-- 11 files changed, 15 insertions(+), 29 deletions(-) (limited to 'hw/xfree86') diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c index 0f40e1b0b..f78267d48 100644 --- a/hw/xfree86/common/xf86DPMS.c +++ b/hw/xfree86/common/xf86DPMS.c @@ -39,8 +39,7 @@ #include "xf86.h" #include "xf86Priv.h" #ifdef DPMSExtension -#define DPMS_SERVER -#include +#include #include "dpmsproc.h" #endif diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c index 98175e9d3..72e1c7580 100644 --- a/hw/xfree86/common/xf86Events.c +++ b/hw/xfree86/common/xf86Events.c @@ -80,8 +80,7 @@ #include "xkbstr.h" #ifdef DPMSExtension -#define DPMS_SERVER -#include +#include #include "dpmsproc.h" #endif diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index e77ffabf9..4cab20c72 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -81,8 +81,7 @@ #include "globals.h" #ifdef DPMSExtension -#define DPMS_SERVER -#include +#include #include "dpmsproc.h" #endif diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index cb1e92090..b4169cf76 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -66,8 +66,7 @@ #include "extinit.h" #ifdef DPMSExtension -#define DPMS_SERVER -#include +#include #include "dpmsproc.h" #endif diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h index 1de14858c..ad53408d5 100644 --- a/hw/xfree86/dixmods/extmod/modinit.h +++ b/hw/xfree86/dixmods/extmod/modinit.h @@ -7,20 +7,16 @@ #define INITARGS void #endif -#define _SHAPE_SERVER_ /* don't want Xlib structures */ -#include +#include #ifdef MULTIBUFFER extern void MultibufferExtensionInit(INITARGS); -#define _MULTIBUF_SERVER_ /* don't want Xlib structures */ -#include +#include #endif #ifdef XTEST extern void XTestExtensionInit(INITARGS); -#define _XTEST_SERVER_ -#include -#include +#include #endif #if 1 @@ -47,7 +43,7 @@ extern void XFree86DGARegister(INITARGS); #ifdef DPMSExtension extern void DPMSExtensionInit(INITARGS); -#include +#include #endif #ifdef XV @@ -65,7 +61,7 @@ extern void ResExtensionInit(INITARGS); #ifdef SHM extern void ShmExtensionInit(INITARGS); -#include +#include extern void ShmRegisterFuncs( ScreenPtr pScreen, ShmFuncsPtr funcs); diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c index 3eee070b8..a58549114 100644 --- a/hw/xfree86/fbdevhw/fbdevhw.c +++ b/hw/xfree86/fbdevhw/fbdevhw.c @@ -25,8 +25,7 @@ #endif #include "globals.h" -#define DPMS_SERVER -#include +#include #define DEBUG 0 diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c index 51fe1152e..82e270312 100644 --- a/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c @@ -40,8 +40,7 @@ #include "xf86Priv.h" #include "xf86RandR12.h" #include "X11/extensions/render.h" -#define DPMS_SERVER -#include "X11/extensions/dpms.h" +#include "X11/extensions/dpmsconst.h" #include "X11/Xatom.h" #ifdef RENDER #include "picturestr.h" diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c index cbaab5738..8c5a94ca3 100644 --- a/hw/xfree86/modes/xf86Cursors.c +++ b/hw/xfree86/modes/xf86Cursors.c @@ -39,8 +39,7 @@ #include "xf86RandR12.h" #include "xf86CursorPriv.h" #include "X11/extensions/render.h" -#define DPMS_SERVER -#include "X11/extensions/dpms.h" +#include "X11/extensions/dpmsconst.h" #include "X11/Xatom.h" #ifdef RENDER #include "picturestr.h" diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c index 618072ab6..e808434e0 100644 --- a/hw/xfree86/modes/xf86Rotate.c +++ b/hw/xfree86/modes/xf86Rotate.c @@ -40,8 +40,7 @@ #include "xf86Modes.h" #include "xf86RandR12.h" #include "X11/extensions/render.h" -#define DPMS_SERVER -#include "X11/extensions/dpms.h" +#include "X11/extensions/dpmsconst.h" #include "X11/Xatom.h" /* borrowed from composite extension, move to Render and publish? */ diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c index 4986b5b29..26f5911d5 100644 --- a/hw/xfree86/vbe/vbe.c +++ b/hw/xfree86/vbe/vbe.c @@ -18,8 +18,7 @@ #include "xf86.h" #include "vbe.h" #include -#define DPMS_SERVER -#include +#include #define VERSION(x) VBE_VERSION_MAJOR(x),VBE_VERSION_MINOR(x) diff --git a/hw/xfree86/vgahw/vgaHW.h b/hw/xfree86/vgahw/vgaHW.h index 0761ddbe0..7e63492d8 100644 --- a/hw/xfree86/vgahw/vgaHW.h +++ b/hw/xfree86/vgahw/vgaHW.h @@ -25,8 +25,7 @@ #include "xf86DDC.h" #include "globals.h" -#define DPMS_SERVER -#include +#include extern _X_EXPORT int vgaHWGetIndex(void); -- cgit v1.2.3