frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix files including xorg-server.h by mistake 

A few files in the server are including xorg-server.h, which is only
for use by Xorg server drivers. This fixes those errors and then adds
a check to make sure it doesn't happen again.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Keith Packard 2014-07-30 10:13:53 -07:00
parent a08e7a098a
commit 90803042bc
6 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dri3/dri3.h
View File

@ -23,8 +23,6 @@
#ifndef _DRI3_H_ #ifndef _DRI3_H_
#define _DRI3_H_ #define _DRI3_H_
#include <xorg-server.h>
#ifdef DRI3 #ifdef DRI3
#include <X11/extensions/dri3proto.h> #include <X11/extensions/dri3proto.h>

1
glamor/glamor_egl.c
View File

@ -30,7 +30,6 @@
#include "dix-config.h" #include "dix-config.h"
#define GLAMOR_FOR_XORG #define GLAMOR_FOR_XORG
#include <xorg-server.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>

1
glamor/glamor_eglmodule.c
View File

@ -29,7 +29,6 @@
#include "dix-config.h" #include "dix-config.h"
#include <xorg-server.h>
#include <xf86.h> #include <xf86.h>
#define GLAMOR_FOR_XORG #define GLAMOR_FOR_XORG
#include <xf86Module.h> #include <xf86Module.h>

1
glamor/glamor_priv.h
View File

@ -29,7 +29,6 @@
#include "dix-config.h" #include "dix-config.h"
#include <xorg-server.h>
#include "glamor.h" #include "glamor.h"
#include "xvdix.h" #include "xvdix.h"

1
hw/xwayland/xwayland.h
View File

@ -27,7 +27,6 @@
#define XWAYLAND_H #define XWAYLAND_H
#include <dix-config.h> #include <dix-config.h>
#include <xorg-server.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>

4
include/xorg-server.h.in
View File

@ -16,6 +16,10 @@
#ifndef _XORG_SERVER_H_ #ifndef _XORG_SERVER_H_
#define _XORG_SERVER_H_ #define _XORG_SERVER_H_
#ifdef HAVE_XORG_CONFIG_H
#error Include xorg-config.h when building the X server
#endif
/* Support BigRequests extension */ /* Support BigRequests extension */
#undef BIGREQS #undef BIGREQS