qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make it possible to build drivers with the newer proto headers. ok oga@.

Browse Source
This commit is contained in:
matthieu 2010-04-13 19:56:37 +00:00
parent 49012820cb
commit 9ac8837d36
11 changed files with 74 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
driver/xf86-video-ati/src/atombios_crtc.c
View File

@ -33,8 +33,12 @@
#include "config.h"
#endif
/* DPMS */
#ifdef HAVE_X11_EXTENSIONS_DPMSCONST_H
#include <X11/extensions/dpmsconst.h>
#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
#endif
#include "radeon.h"
#include "radeon_reg.h"

4
driver/xf86-video-ati/src/atombios_output.c
View File

@ -34,8 +34,12 @@
#include "config.h"
#endif
/* DPMS */
#ifdef HAVE_X11_EXTENSIONS_DPMSCONST_H
#include <X11/extensions/dpmsconst.h>
#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
#endif
#include <unistd.h>
#include "radeon.h"

4
driver/xf86-video-ati/src/radeon_driver.c
View File

@ -104,8 +104,12 @@
#include "vgaHW.h"
#endif
#ifdef HAVE_X11_EXTENSIONS_DPMSCONST_H
#include <X11/extensions/dpmsconst.h>
#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
#endif
#include "atipciids.h"
#include "radeon_chipset_gen.h"

4
driver/xf86-video-glint/src/glint_driver.c
View File

@ -65,8 +65,12 @@
#endif
#include "globals.h"
#ifdef HAVE_X11_EXTENSIONS_DPMSCONST_H
#include <X11/extensions/dpmsconst.h>
#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
#endif
#define DEBUG 0

4
driver/xf86-video-intel/src/ch7017/ch7017.c
View File

@ -39,8 +39,12 @@
#include "miscstruct.h"
#include "xf86i2c.h"
#include "xf86Crtc.h"
#ifdef HAVE_X11_EXTENSIONS_DPMSCONST_H
#include <X11/extensions/dpmsconst.h>
#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
#endif
#include "../i2c_vid.h"
#include "ch7017_reg.h"

4
driver/xf86-video-intel/src/ch7xxx/ch7xxx.c
View File

@ -39,8 +39,12 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "miscstruct.h"
#include "xf86i2c.h"
#include "xf86Crtc.h"
#ifdef HAVE_X11_EXTENSIONS_DPMSCONST_H
#include <X11/extensions/dpmsconst.h>
#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
#endif
#include "../i2c_vid.h"
#include "ch7xxx.h"

4
driver/xf86-video-intel/src/ivch/ivch.c
View File

@ -36,8 +36,12 @@
#include "miscstruct.h"
#include "xf86i2c.h"
#include "xf86Crtc.h"
#ifdef HAVE_X11_EXTENSIONS_DPMSCONST_H
#include <X11/extensions/dpmsconst.h>
#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
#endif
#include <unistd.h>
#include "../i2c_vid.h"

4
driver/xf86-video-intel/src/sil164/sil164.c
View File

@ -40,8 +40,12 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "miscstruct.h"
#include "xf86i2c.h"
#include "xf86Crtc.h"
#ifdef HAVE_X11_EXTENSIONS_DPMSCONST_H
#include <X11/extensions/dpmsconst.h>
#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
#endif
#include "../i2c_vid.h"
#include "sil164.h"

4
driver/xf86-video-intel/src/tfp410/tfp410.c
View File

@ -39,8 +39,12 @@
#include "miscstruct.h"
#include "xf86i2c.h"
#include "xf86Crtc.h"
#ifdef HAVE_X11_EXTENSIONS_DPMSCONST_H
#include <X11/extensions/dpmsconst.h>
#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
#endif
#include "../i2c_vid.h"
#include "tfp410.h"

34
driver/xf86-video-intel/uxa/uxa-priv.h
View File

@ -42,9 +42,13 @@
#define NEED_EVENTS
#include <X11/Xproto.h>
#ifdef MITSHM
#ifdef HAVE_X11_EXTENSIONS_SHMPROTO_H
#include <X11/extensions/shmproto.h>
#else
#define _XSHM_SERVER_
#include <X11/extensions/shmstr.h>
#endif
#endif
#include "scrnintstr.h"
#include "pixmapstr.h"
#include "windowstr.h"
@ -319,6 +323,36 @@ uxa_get_image (DrawablePtr pDrawable, int x, int y, int w, int h,
extern const GCOps uxa_ops;
#ifdef MITSHM
#ifdef HAVE_X11_EXTENSIONS_SHMPROTO_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;
#endif
extern ShmFuncs uxa_shm_funcs;
/* XXX these come from shmint.h, which isn't exported by the server */

4
driver/xf86-video-mach64/src/atimach64.c
View File

@ -63,10 +63,14 @@
#include "atimach64io.h"
#include "atirgb514.h"
#ifdef HAVE_X11_EXTENSIONS_DPMSCONST_H
#include <X11/extensions/dpmsconst.h>
#else
#ifndef DPMS_SERVER
# define DPMS_SERVER
#endif
#include <X11/extensions/dpms.h>
#endif
/*
* ATIMach64PreInit --