Commit d3f6b43a authored by Peter Hutterer's avatar Peter Hutterer

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.
parent 693babbf
...@@ -37,9 +37,7 @@ Equipment Corporation. ...@@ -37,9 +37,7 @@ Equipment Corporation.
#include "dixstruct.h" #include "dixstruct.h"
#include "extnsionst.h" #include "extnsionst.h"
#include "opaque.h" #include "opaque.h"
#define DPMS_SERVER #include <X11/extensions/dpmsproto.h>
#include <X11/extensions/dpms.h>
#include <X11/extensions/dpmsstr.h>
#include "dpmsproc.h" #include "dpmsproc.h"
#include "modinit.h" #include "modinit.h"
......
...@@ -52,8 +52,7 @@ in this Software without prior written authorization from the X Consortium. ...@@ -52,8 +52,7 @@ in this Software without prior written authorization from the X Consortium.
#include "panoramiXsrv.h" #include "panoramiXsrv.h"
#endif #endif
#ifdef DPMSExtension #ifdef DPMSExtension
#define DPMS_SERVER #include <X11/extensions/dpmsconst.h>
#include <X11/extensions/dpms.h>
#endif #endif
#include <stdio.h> #include <stdio.h>
......
...@@ -41,8 +41,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -41,8 +41,7 @@ in this Software without prior written authorization from The Open Group.
#include "dixstruct.h" #include "dixstruct.h"
#include "resource.h" #include "resource.h"
#include "opaque.h" #include "opaque.h"
#define _SHAPE_SERVER_ /* don't want Xlib structures */ #include <X11/extensions/shapeproto.h>
#include <X11/extensions/shapestr.h>
#include "regionstr.h" #include "regionstr.h"
#include "gcstruct.h" #include "gcstruct.h"
#include "modinit.h" #include "modinit.h"
......
...@@ -52,8 +52,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -52,8 +52,7 @@ in this Software without prior written authorization from The Open Group.
#include "servermd.h" #include "servermd.h"
#include "shmint.h" #include "shmint.h"
#include "xace.h" #include "xace.h"
#define _XSHM_SERVER_ #include <X11/extensions/shmproto.h>
#include <X11/extensions/shmstr.h>
#include <X11/Xfuncproto.h> #include <X11/Xfuncproto.h>
/* Needed for Solaris cross-zone shared memory extension */ /* Needed for Solaris cross-zone shared memory extension */
......
...@@ -23,13 +23,39 @@ ...@@ -23,13 +23,39 @@
#ifndef _SHMINT_H_ #ifndef _SHMINT_H_
#define _SHMINT_H_ #define _SHMINT_H_
#define _XSHM_SERVER_ #include <X11/extensions/shmproto.h>
#include <X11/extensions/shmstr.h>
#include "screenint.h" #include "screenint.h"
#include "pixmap.h" #include "pixmap.h"
#include "gc.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 extern _X_EXPORT void
ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs); ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs);
......
...@@ -65,10 +65,7 @@ PERFORMANCE OF THIS SOFTWARE. ...@@ -65,10 +65,7 @@ PERFORMANCE OF THIS SOFTWARE.
#include "dixstruct.h" #include "dixstruct.h"
#include "resource.h" #include "resource.h"
#include "opaque.h" #include "opaque.h"
#define _SYNC_SERVER #include <X11/extensions/syncproto.h>
#include <X11/extensions/sync.h>
#undef _SYNC_SERVER
#include <X11/extensions/syncstr.h>
#include "syncsrv.h" #include "syncsrv.h"
#include <stdio.h> #include <stdio.h>
......
...@@ -44,9 +44,7 @@ ...@@ -44,9 +44,7 @@
#include "mi.h" #include "mi.h"
#include "xkbsrv.h" #include "xkbsrv.h"
#include "xkbstr.h" #include "xkbstr.h"
#define _XTEST_SERVER_ #include <X11/extensions/xtestproto.h>
#include <X11/extensions/XTest.h>
#include <X11/extensions/xteststr.h>
#include <X11/extensions/XI.h> #include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h> #include <X11/extensions/XIproto.h>
#include "exglobals.h" #include "exglobals.h"
......
...@@ -42,8 +42,7 @@ SOFTWARE. ...@@ -42,8 +42,7 @@ SOFTWARE.
#include <X11/extensions/Xvproto.h> #include <X11/extensions/Xvproto.h>
#include "xvdix.h" #include "xvdix.h"
#ifdef MITSHM #ifdef MITSHM
#define _XSHM_SERVER_ #include <X11/extensions/shmproto.h>
#include <X11/extensions/shmstr.h>
#endif #endif
#include "xvdisp.h" #include "xvdisp.h"
......
...@@ -704,7 +704,7 @@ XEXT_LIB='$(top_builddir)/Xext/libXext.la' ...@@ -704,7 +704,7 @@ XEXT_LIB='$(top_builddir)/Xext/libXext.la'
XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
dnl Core modules for most extensions, et al. 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]" REQUIRED_LIBS="xfont xau fontenc [pixman-1 >= 0.15.14]"
dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas
......
...@@ -111,8 +111,7 @@ Equipment Corporation. ...@@ -111,8 +111,7 @@ Equipment Corporation.
#endif #endif
#ifdef DPMSExtension #ifdef DPMSExtension
#define DPMS_SERVER #include <X11/extensions/dpmsconst.h>
#include <X11/extensions/dpms.h>
#include "dpmsproc.h" #include "dpmsproc.h"
#endif #endif
......
...@@ -39,8 +39,7 @@ ...@@ -39,8 +39,7 @@
#include "xf86.h" #include "xf86.h"
#include "xf86Priv.h" #include "xf86Priv.h"
#ifdef DPMSExtension #ifdef DPMSExtension
#define DPMS_SERVER #include <X11/extensions/dpmsconst.h>
#include <X11/extensions/dpms.h>
#include "dpmsproc.h" #include "dpmsproc.h"
#endif #endif
......
...@@ -80,8 +80,7 @@ ...@@ -80,8 +80,7 @@
#include "xkbstr.h" #include "xkbstr.h"
#ifdef DPMSExtension #ifdef DPMSExtension
#define DPMS_SERVER #include <X11/extensions/dpmsconst.h>
#include <X11/extensions/dpms.h>
#include "dpmsproc.h" #include "dpmsproc.h"
#endif #endif
......
...@@ -81,8 +81,7 @@ ...@@ -81,8 +81,7 @@
#include "globals.h" #include "globals.h"
#ifdef DPMSExtension #ifdef DPMSExtension
#define DPMS_SERVER #include <X11/extensions/dpmsconst.h>
#include <X11/extensions/dpms.h>
#include "dpmsproc.h" #include "dpmsproc.h"
#endif #endif
......
...@@ -66,8 +66,7 @@ ...@@ -66,8 +66,7 @@
#include "extinit.h" #include "extinit.h"
#ifdef DPMSExtension #ifdef DPMSExtension
#define DPMS_SERVER #include <X11/extensions/dpmsconst.h>
#include <X11/extensions/dpms.h>
#include "dpmsproc.h" #include "dpmsproc.h"
#endif #endif
......
...@@ -7,20 +7,16 @@ ...@@ -7,20 +7,16 @@
#define INITARGS void #define INITARGS void
#endif #endif
#define _SHAPE_SERVER_ /* don't want Xlib structures */ #include <X11/extensions/shapeproto.h>
#include <X11/extensions/shapestr.h>
#ifdef MULTIBUFFER #ifdef MULTIBUFFER
extern void MultibufferExtensionInit(INITARGS); extern void MultibufferExtensionInit(INITARGS);
#define _MULTIBUF_SERVER_ /* don't want Xlib structures */ #include <X11/extensions/multibufproto.h>
#include <X11/extensions/multibufst.h>
#endif #endif
#ifdef XTEST #ifdef XTEST
extern void XTestExtensionInit(INITARGS); extern void XTestExtensionInit(INITARGS);
#define _XTEST_SERVER_ #include <X11/extensions/xtestproto.h>
#include <X11/extensions/XTest.h>
#include <X11/extensions/xteststr.h>
#endif #endif
#if 1 #if 1
...@@ -47,7 +43,7 @@ extern void XFree86DGARegister(INITARGS); ...@@ -47,7 +43,7 @@ extern void XFree86DGARegister(INITARGS);
#ifdef DPMSExtension #ifdef DPMSExtension
extern void DPMSExtensionInit(INITARGS); extern void DPMSExtensionInit(INITARGS);
#include <X11/extensions/dpmsstr.h> #include <X11/extensions/dpmsconst.h>
#endif #endif
#ifdef XV #ifdef XV
...@@ -65,7 +61,7 @@ extern void ResExtensionInit(INITARGS); ...@@ -65,7 +61,7 @@ extern void ResExtensionInit(INITARGS);
#ifdef SHM #ifdef SHM
extern void ShmExtensionInit(INITARGS); extern void ShmExtensionInit(INITARGS);
#include <X11/extensions/shmstr.h> #include <X11/extensions/shmproto.h>
extern void ShmRegisterFuncs( extern void ShmRegisterFuncs(
ScreenPtr pScreen, ScreenPtr pScreen,
ShmFuncsPtr funcs); ShmFuncsPtr funcs);
......
...@@ -25,8 +25,7 @@ ...@@ -25,8 +25,7 @@
#endif #endif
#include "globals.h" #include "globals.h"
#define DPMS_SERVER #include <X11/extensions/dpmsconst.h>
#include <X11/extensions/dpms.h>
#define DEBUG 0 #define DEBUG 0
......
...@@ -40,8 +40,7 @@ ...@@ -40,8 +40,7 @@
#include "xf86Priv.h" #include "xf86Priv.h"
#include "xf86RandR12.h" #include "xf86RandR12.h"
#include "X11/extensions/render.h" #include "X11/extensions/render.h"
#define DPMS_SERVER #include "X11/extensions/dpmsconst.h"
#include "X11/extensions/dpms.h"
#include "X11/Xatom.h" #include "X11/Xatom.h"
#ifdef RENDER #ifdef RENDER
#include "picturestr.h" #include "picturestr.h"
......
...@@ -39,8 +39,7 @@ ...@@ -39,8 +39,7 @@
#include "xf86RandR12.h" #include "xf86RandR12.h"
#include "xf86CursorPriv.h" #include "xf86CursorPriv.h"
#include "X11/extensions/render.h" #include "X11/extensions/render.h"
#define DPMS_SERVER #include "X11/extensions/dpmsconst.h"
#include "X11/extensions/dpms.h"
#include "X11/Xatom.h" #include "X11/Xatom.h"
#ifdef RENDER #ifdef RENDER
#include "picturestr.h" #include "picturestr.h"
......
...@@ -40,8 +40,7 @@ ...@@ -40,8 +40,7 @@
#include "xf86Modes.h" #include "xf86Modes.h"
#include "xf86RandR12.h" #include "xf86RandR12.h"
#include "X11/extensions/render.h" #include "X11/extensions/render.h"
#define DPMS_SERVER #include "X11/extensions/dpmsconst.h"
#include "X11/extensions/dpms.h"
#include "X11/Xatom.h" #include "X11/Xatom.h"
/* borrowed from composite extension, move to Render and publish? */ /* borrowed from composite extension, move to Render and publish? */
......
...@@ -18,8 +18,7 @@ ...@@ -18,8 +18,7 @@
#include "xf86.h" #include "xf86.h"
#include "vbe.h" #include "vbe.h"
#include <X11/Xarch.h> #include <X11/Xarch.h>
#define DPMS_SERVER #include <X11/extensions/dpmsconst.h>
#include <X11/extensions/dpms.h>
#define VERSION(x) VBE_VERSION_MAJOR(x),VBE_VERSION_MINOR(x) #define VERSION(x) VBE_VERSION_MAJOR(x),VBE_VERSION_MINOR(x)
......
...@@ -25,8 +25,7 @@ ...@@ -25,8 +25,7 @@
#include "xf86DDC.h" #include "xf86DDC.h"
#include "globals.h" #include "globals.h"
#define DPMS_SERVER #include <X11/extensions/dpmsconst.h>
#include <X11/extensions/dpms.h>
extern _X_EXPORT int vgaHWGetIndex(void); extern _X_EXPORT int vgaHWGetIndex(void);
......
...@@ -54,8 +54,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -54,8 +54,7 @@ in this Software without prior written authorization from The Open Group.
#ifdef DPMSExtension #ifdef DPMSExtension
# include "dpmsproc.h" # include "dpmsproc.h"
# define DPMS_SERVER # include <X11/extensions/dpmsconst.h>
# include <X11/extensions/dpms.h>
#endif #endif
#define QUEUE_SIZE 512 #define QUEUE_SIZE 512
......
...@@ -156,17 +156,15 @@ typedef void (*InitExtension)(INITARGS); ...@@ -156,17 +156,15 @@ typedef void (*InitExtension)(INITARGS);
#endif #endif
#ifdef MITSHM #ifdef MITSHM
#define _XSHM_SERVER_ #include <X11/extensions/shm.h>
#include <X11/extensions/shmstr.h>
#endif #endif
#ifdef XTEST #ifdef XTEST
#define _XTEST_SERVER_ #include <X11/extensions/xtest.h>
#include <X11/extensions/XTest.h>
#endif #endif
#include <X11/extensions/XKB.h> #include <X11/extensions/XKB.h>
#ifdef XCSECURITY #ifdef XCSECURITY
#include "securitysrv.h" #include "securitysrv.h"
#include <X11/extensions/securstr.h> #include <X11/extensions/secur.h>
#endif #endif
#ifdef XSELINUX #ifdef XSELINUX
#include "xselinux.h" #include "xselinux.h"
......
...@@ -39,8 +39,7 @@ from The Open Group. ...@@ -39,8 +39,7 @@ from The Open Group.
#include "dix.h" #include "dix.h"
#include "miline.h" #include "miline.h"
#ifdef MITSHM #ifdef MITSHM
#define _XSHM_SERVER_ #include <X11/extensions/shm.h>
#include <X11/extensions/XShm.h>
#endif #endif
/* We use this structure to propogate some information from miScreenInit to /* We use this structure to propogate some information from miScreenInit to
......
...@@ -111,8 +111,7 @@ mffs(fd_mask mask) ...@@ -111,8 +111,7 @@ mffs(fd_mask mask)
} }
#ifdef DPMSExtension #ifdef DPMSExtension
#define DPMS_SERVER #include <X11/extensions/dpmsconst.h>
#include <X11/extensions/dpms.h>
#endif #endif
struct _OsTimerRec { struct _OsTimerRec {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment