diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-15 16:51:05 +1000 |
|---|---|---|
| committer | Julien Viard de Galbert <julien@vdg.blogsite.org> | 2010-03-08 15:02:11 +0100 |
| commit | e79fa251feb75b710881fadf9ac57f0a188f8180 (patch) | |
| tree | a3fcf0f165e49b8c9812d890691e13b072bc0eef /hw/xfree86/dixmods/extmod | |
| parent | 898ed44ba3d296a9499f4f6d030c0b792466f3db (diff) | |
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.
+conflict fixing
Diffstat (limited to 'hw/xfree86/dixmods/extmod')
| -rw-r--r-- | hw/xfree86/dixmods/extmod/modinit.h | 14 |
1 files changed, 5 insertions, 9 deletions
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 <X11/extensions/shapestr.h> +#include <X11/extensions/shapeproto.h> #ifdef MULTIBUFFER extern void MultibufferExtensionInit(INITARGS); -#define _MULTIBUF_SERVER_ /* don't want Xlib structures */ -#include <X11/extensions/multibufst.h> +#include <X11/extensions/multibufproto.h> #endif #ifdef XTEST extern void XTestExtensionInit(INITARGS); -#define _XTEST_SERVER_ -#include <X11/extensions/XTest.h> -#include <X11/extensions/xteststr.h> +#include <X11/extensions/xtestproto.h> #endif #if 1 @@ -47,7 +43,7 @@ extern void XFree86DGARegister(INITARGS); #ifdef DPMSExtension extern void DPMSExtensionInit(INITARGS); -#include <X11/extensions/dpmsstr.h> +#include <X11/extensions/dpmsconst.h> #endif #ifdef XV @@ -65,7 +61,7 @@ extern void ResExtensionInit(INITARGS); #ifdef SHM extern void ShmExtensionInit(INITARGS); -#include <X11/extensions/shmstr.h> +#include <X11/extensions/shmproto.h> extern void ShmRegisterFuncs( ScreenPtr pScreen, ShmFuncsPtr funcs); |