From d3f6b43a240eb763025b3cbf546cb7ae502c94fa Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 15 Jul 2009 16:51:05 +1000 Subject: [PATCH] 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. --- Xext/dpms.c | 4 +--- Xext/saver.c | 3 +-- Xext/shape.c | 3 +-- Xext/shm.c | 3 +-- Xext/shmint.h | 30 +++++++++++++++++++++++++++-- Xext/sync.c | 5 +---- Xext/xtest.c | 4 +--- Xext/xvdisp.c | 3 +-- configure.ac | 2 +- dix/main.c | 3 +-- 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 +-- mi/mieq.c | 3 +-- mi/miinitext.c | 8 +++----- mi/miscrinit.c | 3 +-- os/WaitFor.c | 3 +-- 25 files changed, 58 insertions(+), 63 deletions(-) diff --git a/Xext/dpms.c b/Xext/dpms.c index 8464f9e98c..21ba923d68 100644 --- a/Xext/dpms.c +++ b/Xext/dpms.c @@ -37,9 +37,7 @@ Equipment Corporation. #include "dixstruct.h" #include "extnsionst.h" #include "opaque.h" -#define DPMS_SERVER -#include -#include +#include #include "dpmsproc.h" #include "modinit.h" diff --git a/Xext/saver.c b/Xext/saver.c index 06dbc7397c..18de4b5407 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -52,8 +52,7 @@ in this Software without prior written authorization from the X Consortium. #include "panoramiXsrv.h" #endif #ifdef DPMSExtension -#define DPMS_SERVER -#include +#include #endif #include diff --git a/Xext/shape.c b/Xext/shape.c index a5ae455787..53167d140f 100644 --- a/Xext/shape.c +++ b/Xext/shape.c @@ -41,8 +41,7 @@ in this Software without prior written authorization from The Open Group. #include "dixstruct.h" #include "resource.h" #include "opaque.h" -#define _SHAPE_SERVER_ /* don't want Xlib structures */ -#include +#include #include "regionstr.h" #include "gcstruct.h" #include "modinit.h" diff --git a/Xext/shm.c b/Xext/shm.c index cdda09f7fa..dd097e605a 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -52,8 +52,7 @@ in this Software without prior written authorization from The Open Group. #include "servermd.h" #include "shmint.h" #include "xace.h" -#define _XSHM_SERVER_ -#include +#include #include /* Needed for Solaris cross-zone shared memory extension */ diff --git a/Xext/shmint.h b/Xext/shmint.h index ec1688d531..8f8a00d4fb 100644 --- a/Xext/shmint.h +++ b/Xext/shmint.h @@ -23,13 +23,39 @@ #ifndef _SHMINT_H_ #define _SHMINT_H_ -#define _XSHM_SERVER_ -#include +#include #include "screenint.h" #include "pixmap.h" #include "gc.h" +#define XSHM_PUT_IMAGE_ARGS \ + DrawablePtr /* dst */, \ + GCPtr /* pGC */, \ + int /* depth */, \ + unsigned int /* format */, \ + int /* w */, \ + int /* h */, \ + int /* sx */, \ + int /* sy */, \ + int /* sw */, \ + int /* sh */, \ + int /* dx */, \ + int /* dy */, \ + char * /* data */ + +#define XSHM_CREATE_PIXMAP_ARGS \ + ScreenPtr /* pScreen */, \ + int /* width */, \ + int /* height */, \ + int /* depth */, \ + char * /* addr */ + +typedef struct _ShmFuncs { + PixmapPtr (* CreatePixmap)(XSHM_CREATE_PIXMAP_ARGS); + void (* PutImage)(XSHM_PUT_IMAGE_ARGS); +} ShmFuncs, *ShmFuncsPtr; + extern _X_EXPORT void ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs); diff --git a/Xext/sync.c b/Xext/sync.c index a38ec7b856..0bcf8057a4 100644 --- a/Xext/sync.c +++ b/Xext/sync.c @@ -65,10 +65,7 @@ PERFORMANCE OF THIS SOFTWARE. #include "dixstruct.h" #include "resource.h" #include "opaque.h" -#define _SYNC_SERVER -#include -#undef _SYNC_SERVER -#include +#include #include "syncsrv.h" #include diff --git a/Xext/xtest.c b/Xext/xtest.c index cbbc51af4f..5eddffaf1e 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -44,9 +44,7 @@ #include "mi.h" #include "xkbsrv.h" #include "xkbstr.h" -#define _XTEST_SERVER_ -#include -#include +#include #include #include #include "exglobals.h" diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c index 3bff2ece98..04cd11a3f4 100644 --- a/Xext/xvdisp.c +++ b/Xext/xvdisp.c @@ -42,8 +42,7 @@ SOFTWARE. #include #include "xvdix.h" #ifdef MITSHM -#define _XSHM_SERVER_ -#include +#include #endif #include "xvdisp.h" diff --git a/configure.ac b/configure.ac index cd11f21eaf..bf709da119 100644 --- a/configure.ac +++ b/configure.ac @@ -704,7 +704,7 @@ XEXT_LIB='$(top_builddir)/Xext/libXext.la' XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' dnl Core modules for most extensions, et al. -REQUIRED_MODULES="[randrproto >= 1.2.99.3] [renderproto >= 0.11] [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto [xextproto >= 7.0.3] [xproto >= 7.0.13] [xtrans >= 1.2.2] bigreqsproto resourceproto fontsproto [inputproto >= 1.9.99.14] [kbproto >= 1.0.3]" +REQUIRED_MODULES="[randrproto >= 1.2.99.3] [renderproto >= 0.11] [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto [xextproto >= 7.0.99.1] [xproto >= 7.0.13] [xtrans >= 1.2.2] bigreqsproto resourceproto fontsproto [inputproto >= 1.9.99.14] [kbproto >= 1.0.3]" REQUIRED_LIBS="xfont xau fontenc [pixman-1 >= 0.15.14]" dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas diff --git a/dix/main.c b/dix/main.c index 25b085e88d..94c252af37 100644 --- a/dix/main.c +++ b/dix/main.c @@ -111,8 +111,7 @@ Equipment Corporation. #endif #ifdef DPMSExtension -#define DPMS_SERVER -#include +#include #include "dpmsproc.h" #endif diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c index 0f40e1b0b8..f78267d48f 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 98175e9d3e..72e1c75809 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 e77ffabf92..4cab20c72d 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 cb1e92090d..b4169cf764 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 1de14858c2..ad53408d50 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 3eee070b86..a58549114a 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 51fe1152ee..82e2703127 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 cbaab57383..8c5a94ca3a 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 618072ab65..e808434e0a 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 4986b5b29c..26f5911d56 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 0761ddbe01..7e63492d86 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); diff --git a/mi/mieq.c b/mi/mieq.c index fd2de0e242..f9ceab2fa7 100644 --- a/mi/mieq.c +++ b/mi/mieq.c @@ -54,8 +54,7 @@ in this Software without prior written authorization from The Open Group. #ifdef DPMSExtension # include "dpmsproc.h" -# define DPMS_SERVER -# include +# include #endif #define QUEUE_SIZE 512 diff --git a/mi/miinitext.c b/mi/miinitext.c index 9520957ee8..fbe92216fe 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -156,17 +156,15 @@ typedef void (*InitExtension)(INITARGS); #endif #ifdef MITSHM -#define _XSHM_SERVER_ -#include +#include #endif #ifdef XTEST -#define _XTEST_SERVER_ -#include +#include #endif #include #ifdef XCSECURITY #include "securitysrv.h" -#include +#include #endif #ifdef XSELINUX #include "xselinux.h" diff --git a/mi/miscrinit.c b/mi/miscrinit.c index fe768f4a93..996d424761 100644 --- a/mi/miscrinit.c +++ b/mi/miscrinit.c @@ -39,8 +39,7 @@ from The Open Group. #include "dix.h" #include "miline.h" #ifdef MITSHM -#define _XSHM_SERVER_ -#include +#include #endif /* We use this structure to propogate some information from miScreenInit to diff --git a/os/WaitFor.c b/os/WaitFor.c index 4b59525650..dfe85e515c 100644 --- a/os/WaitFor.c +++ b/os/WaitFor.c @@ -111,8 +111,7 @@ mffs(fd_mask mask) } #ifdef DPMSExtension -#define DPMS_SERVER -#include +#include #endif struct _OsTimerRec {