andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update to xextproto 7.0.99.1.

Browse Source 
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.
(cherry picked from commit d3f6b43a24)
This commit is contained in:
Jeremy Huddleston 2009-08-25 20:25:55 -07:00
parent 3af4b6fe23
commit 369326c96d
25 changed files with 58 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Xext/dpms.c
View File

@ -44,9 +44,7 @@ Equipment Corporation.
#include "dixstruct.h"
#include "extnsionst.h"
#include "opaque.h"
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
#include <X11/extensions/dpmsstr.h>
#include <X11/extensions/dpmsproto.h>
#include "dpmsproc.h"
#include "modinit.h"

3
Xext/saver.c
View File

@ -54,8 +54,7 @@ in this Software without prior written authorization from the X Consortium.
#include "panoramiXsrv.h"
#endif
#ifdef DPMSExtension
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
#include <X11/extensions/dpmsconst.h>
#endif
#include <stdio.h>

3
Xext/shape.c
View File

@ -43,8 +43,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 <X11/extensions/shapestr.h>
#include <X11/extensions/shapeproto.h>
#include "regionstr.h"
#include "gcstruct.h"
#include "modinit.h"

3
Xext/shm.c
View File

@ -54,8 +54,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 <X11/extensions/shmstr.h>
#include <X11/extensions/shmproto.h>
#include <X11/Xfuncproto.h>
/* Needed for Solaris cross-zone shared memory extension */

30
Xext/shmint.h
View File

@ -23,13 +23,39 @@
#ifndef _SHMINT_H_
#define _SHMINT_H_
#define _XSHM_SERVER_
#include <X11/extensions/shmstr.h>
#include <X11/extensions/shmproto.h>
#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;
void
ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs);

3
Xext/sync.c
View File

@ -67,8 +67,7 @@ PERFORMANCE OF THIS SOFTWARE.
#include "dixstruct.h"
#include "resource.h"
#include "opaque.h"
#include <X11/extensions/sync.h>
#include <X11/extensions/syncstr.h>
#include <X11/extensions/syncproto.h>
#include "syncsrv.h"
#include <stdio.h>

4
Xext/xtest.c
View File

@ -43,9 +43,7 @@
#include "dixevents.h"
#include "sleepuntil.h"
#include "mi.h"
#define _XTEST_SERVER_
#include <X11/extensions/XTest.h>
#include <X11/extensions/xteststr.h>
#include <X11/extensions/xtestproto.h>
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>

3
Xext/xvdisp.c
View File

@ -42,8 +42,7 @@ SOFTWARE.
#include <X11/extensions/Xvproto.h>
#include "xvdix.h"
#ifdef MITSHM
#define _XSHM_SERVER_
#include <X11/extensions/shmstr.h>
#include <X11/extensions/shmproto.h>
#endif
#include "xvdisp.h"

2
configure.ac
View File

@ -672,7 +672,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.1] [renderproto >= 0.9.3] [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto [xextproto >= 7.0.3] [xproto >= 7.0.13] [xtrans >= 1.2.2] bigreqsproto resourceproto fontsproto [inputproto >= 1.5] [kbproto >= 1.0.3]"
REQUIRED_MODULES="[randrproto >= 1.2.99.1] [renderproto >= 0.9.3] [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.5] [kbproto >= 1.0.3]"
REQUIRED_LIBS="xfont xau fontenc [pixman-1 >= 0.13.2]"
dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas

3
dix/main.c
View File

@ -111,8 +111,7 @@ Equipment Corporation.
#endif
#ifdef DPMSExtension
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
#include <X11/extensions/dpmsconst.h>
#include "dpmsproc.h"
#endif

3
hw/xfree86/common/xf86DPMS.c
View File

@ -40,8 +40,7 @@
#include "xf86.h"
#include "xf86Priv.h"
#ifdef DPMSExtension
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
#include <X11/extensions/dpmsconst.h>
#include "dpmsproc.h"
#endif

3
hw/xfree86/common/xf86Events.c
View File

@ -82,8 +82,7 @@
#endif
#ifdef DPMSExtension
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
#include <X11/extensions/dpmsconst.h>
#include "dpmsproc.h"
#endif

3
hw/xfree86/common/xf86Init.c
View File

@ -83,8 +83,7 @@
#include "globals.h"
#ifdef DPMSExtension
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
#include <X11/extensions/dpmsconst.h>
#include "dpmsproc.h"
#endif

3
hw/xfree86/common/xf86Xinput.c
View File

@ -65,8 +65,7 @@
#include "extinit.h"
#ifdef DPMSExtension
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
#include <X11/extensions/dpmsconst.h>
#include "dpmsproc.h"
#endif

14
hw/xfree86/dixmods/extmod/modinit.h
View File

@ -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);

3
hw/xfree86/fbdevhw/fbdevhw.c
View File

@ -25,8 +25,7 @@
#endif
#include "globals.h"
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
#include <X11/extensions/dpmsconst.h>
#define DEBUG 0

3
hw/xfree86/modes/xf86Crtc.c
View File

@ -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"

3
hw/xfree86/modes/xf86Cursors.c
View File

@ -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"

3
hw/xfree86/modes/xf86Rotate.c
View File

@ -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? */

3
hw/xfree86/vbe/vbe.c
View File

@ -18,8 +18,7 @@
#include "xf86.h"
#include "vbe.h"
#include <X11/Xarch.h>
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
#include <X11/extensions/dpmsconst.h>
#define VERSION(x) VBE_VERSION_MAJOR(x),VBE_VERSION_MINOR(x)

3
hw/xfree86/vgahw/vgaHW.h
View File

@ -25,8 +25,7 @@
#include "xf86DDC.h"
#include "globals.h"
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
#include <X11/extensions/dpmsconst.h>
extern int vgaHWGetIndex(void);

3
mi/mieq.c
View File

@ -55,8 +55,7 @@ in this Software without prior written authorization from The Open Group.
#ifdef DPMSExtension
# include "dpmsproc.h"
# define DPMS_SERVER
# include <X11/extensions/dpms.h>
# include <X11/extensions/dpmsconst.h>
#endif
#define QUEUE_SIZE 512

8
mi/miinitext.c
View File

@ -160,19 +160,17 @@ typedef void (*InitExtension)(INITARGS);
#endif
#ifdef MITSHM
#define _XSHM_SERVER_
#include <X11/extensions/shmstr.h>
#include <X11/extensions/shm.h>
#endif
#ifdef XTEST
#define _XTEST_SERVER_
#include <X11/extensions/XTest.h>
#include <X11/extensions/xtest.h>
#endif
#ifdef XKB
#include <X11/extensions/XKB.h>
#endif
#ifdef XCSECURITY
#include "securitysrv.h"
#include <X11/extensions/securstr.h>
#include <X11/extensions/secur.h>
#endif
#ifdef XSELINUX
#include "xselinux.h"

3
mi/miscrinit.c
View File

@ -39,8 +39,7 @@ from The Open Group.
#include "dix.h"
#include "miline.h"
#ifdef MITSHM
#define _XSHM_SERVER_
#include <X11/extensions/XShm.h>
#include <X11/extensions/shm.h>
#endif
/* We use this structure to propogate some information from miScreenInit to

3
os/WaitFor.c
View File

@ -109,8 +109,7 @@ mffs(fd_mask mask)
}
#ifdef DPMSExtension
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
#include <X11/extensions/dpmsconst.h>
#endif
struct _OsTimerRec {