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

Fix more include paths; add dix-config.h to XKB code.

This commit is contained in:
Daniel Stone 2005-07-03 07:37:35 +00:00
parent e03198972c
commit 46b64bd5c6
26 changed files with 65 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
composite/compalloc.c
View File

@ -26,9 +26,6 @@
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "compint.h" #include "compint.h"
void void

3
composite/compext.c
View File

@ -26,9 +26,6 @@
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "compint.h" #include "compint.h"
static CARD8 CompositeReqCode; static CARD8 CompositeReqCode;

3
composite/compinit.c
View File

@ -26,9 +26,6 @@
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "compint.h" #include "compint.h"
int CompScreenPrivateIndex; int CompScreenPrivateIndex;

3
composite/compwindow.c
View File

@ -26,9 +26,6 @@
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "compint.h" #include "compint.h"
#ifdef COMPOSITE_DEBUG #ifdef COMPOSITE_DEBUG

3
damageext/damageext.c
View File

@ -26,9 +26,6 @@
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "damageextint.h" #include "damageextint.h"
unsigned char DamageReqCode; unsigned char DamageReqCode;

4
fb/fbcompose.c
View File

@ -24,13 +24,11 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE. * SOFTWARE.
*/ */
#ifdef HAVE_DIX_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "fb.h" #include "fb.h"
#ifdef RENDER #ifdef RENDER

3
fb/fbedge.c
View File

@ -26,9 +26,6 @@
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "fb.h" #include "fb.h"
#ifdef RENDER #ifdef RENDER

3
miext/damage/damage.c
View File

@ -26,9 +26,6 @@
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <X11/X.h> #include <X11/X.h>
#include "scrnintstr.h" #include "scrnintstr.h"
#include "windowstr.h" #include "windowstr.h"

3
render/filter.c
View File

@ -26,9 +26,6 @@
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <X11/misc.h> #include <X11/misc.h>
#include "scrnintstr.h" #include "scrnintstr.h"
#include <X11/os.h> #include <X11/os.h>

3
render/picture.c
View File

@ -27,9 +27,6 @@
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <X11/misc.h> #include <X11/misc.h>
#include "scrnintstr.h" #include "scrnintstr.h"
#include <X11/os.h> #include <X11/os.h>

3
xfixes/cursor.c
View File

@ -26,9 +26,6 @@
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "xfixesint.h" #include "xfixesint.h"
#include "scrnintstr.h" #include "scrnintstr.h"
#include "cursorstr.h" #include "cursorstr.h"

3
xfixes/region.c
View File

@ -26,9 +26,6 @@
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "xfixesint.h" #include "xfixesint.h"
#include "scrnintstr.h" #include "scrnintstr.h"
#ifdef RENDER #ifdef RENDER

3
xfixes/saveset.c
View File

@ -26,9 +26,6 @@
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "xfixesint.h" #include "xfixesint.h"
int int

3
xfixes/select.c
View File

@ -26,9 +26,6 @@
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "xfixesint.h" #include "xfixesint.h"
static RESTYPE SelectionClientType, SelectionWindowType; static RESTYPE SelectionClientType, SelectionWindowType;

3
xfixes/xfixes.c
View File

@ -26,9 +26,6 @@
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "xfixesint.h" #include "xfixesint.h"
unsigned char XFixesReqCode; unsigned char XFixesReqCode;

13
xkb/XKBAlloc.c
View File

@ -28,13 +28,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifdef HAVE_DIX_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h> #include <dix-config.h>
#elif defined(HAVE_CONFIG_H)
#include <config.h>
#endif #endif
#ifndef XKB_IN_SERVER #ifndef XKB_IN_SERVER
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <stdio.h> #include <stdio.h>
#define NEED_REPLIES #define NEED_REPLIES
#define NEED_EVENTS #define NEED_EVENTS
@ -47,14 +46,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#else #else
#include <stdio.h> #include <stdio.h>
#include "X.h" #include <X11/X.h>
#define NEED_EVENTS #define NEED_EVENTS
#define NEED_REPLIES #define NEED_REPLIES
#include "Xproto.h" #include <X11/Xproto.h>
#include "misc.h" #include "misc.h"
#include "inputstr.h" #include "inputstr.h"
#include "XKBsrv.h" #include <X11/extensions/XKBsrv.h>
#include "XKBgeom.h" #include <X11/extensions/XKBgeom.h>
#endif /* XKB_IN_SERVER */ #endif /* XKB_IN_SERVER */

21
xkb/XKBGAlloc.c
View File

@ -26,18 +26,17 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/ ********************************************************/
/* $XFree86: xc/lib/X11/XKBGAlloc.c,v 3.4 2001/01/17 19:41:48 dawes Exp $ */ /* $XFree86: xc/lib/X11/XKBGAlloc.c,v 3.4 2001/01/17 19:41:48 dawes Exp $ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#elif defined(HAVE_CONFIG_H)
#include <config.h>
#endif
#define NEED_EVENTS #define NEED_EVENTS
#define NEED_REPLIES #define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifndef XKB_IN_SERVER #ifndef XKB_IN_SERVER
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <stdio.h> #include <stdio.h>
#include "Xlibint.h" #include "Xlibint.h"
#include "XKBlibint.h" #include "XKBlibint.h"
@ -47,12 +46,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#else #else
#include <stdio.h> #include <stdio.h>
#include "X.h" #include <X11/X.h>
#include "Xproto.h" #include <X11/Xproto.h>
#include "misc.h" #include "misc.h"
#include "inputstr.h" #include "inputstr.h"
#include "XKBsrv.h" #include <X11/extensions/XKBsrv.h>
#include "XKBgeom.h" #include <X11/extensions/XKBgeom.h>
#endif /* XKB_IN_SERVER */ #endif /* XKB_IN_SERVER */

11
xkb/XKBMAlloc.c
View File

@ -28,13 +28,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifdef HAVE_DIX_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h> #include <dix-config.h>
#elif defined(HAVE_CONFIG_H)
#include <config.h>
#endif #endif
#ifndef XKB_IN_SERVER #ifndef XKB_IN_SERVER
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <stdio.h> #include <stdio.h>
#define NEED_REPLIES #define NEED_REPLIES
#define NEED_EVENTS #define NEED_EVENTS
@ -46,15 +45,15 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#else #else
#include <stdio.h> #include <stdio.h>
#include "X.h" #include <X11/X.h>
#define NEED_EVENTS #define NEED_EVENTS
#define NEED_REPLIES #define NEED_REPLIES
#include "Xproto.h" #include <X11/Xproto.h>
#include "misc.h" #include "misc.h"
#include "inputstr.h" #include "inputstr.h"
#include <X11/keysym.h> #include <X11/keysym.h>
#define XKBSRV_NEED_FILE_FUNCS #define XKBSRV_NEED_FILE_FUNCS
#include "XKBsrv.h" #include <X11/extensions/XKBsrv.h>
#endif /* XKB_IN_SERVER */ #endif /* XKB_IN_SERVER */

11
xkb/XKBMisc.c
View File

@ -28,13 +28,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifdef HAVE_DIX_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h> #include <dix-config.h>
#elif defined(HAVE_CONFIG_H)
#include <config.h>
#endif #endif
#ifndef XKB_IN_SERVER #ifndef XKB_IN_SERVER
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <stdio.h> #include <stdio.h>
#define NEED_REPLIES #define NEED_REPLIES
#define NEED_EVENTS #define NEED_EVENTS
@ -46,15 +45,15 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#else #else
#include <stdio.h> #include <stdio.h>
#include "X.h" #include <X11/X.h>
#define NEED_EVENTS #define NEED_EVENTS
#define NEED_REPLIES #define NEED_REPLIES
#include "Xproto.h" #include <X11/Xproto.h>
#include "misc.h" #include "misc.h"
#include "inputstr.h" #include "inputstr.h"
#include <X11/keysym.h> #include <X11/keysym.h>
#define XKBSRV_NEED_FILE_FUNCS #define XKBSRV_NEED_FILE_FUNCS
#include "XKBsrv.h" #include <X11/extensions/XKBsrv.h>
#endif /* XKB_IN_SERVER */ #endif /* XKB_IN_SERVER */

9
xkb/maprules.c
View File

@ -28,11 +28,10 @@
#ifdef HAVE_DIX_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h> #include <dix-config.h>
#endif #elif defined(HAVE_CONFIG_H)
#ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
#include <stdlib.h> #include <stdlib.h>
@ -67,9 +66,9 @@
#include "misc.h" #include "misc.h"
#include "inputstr.h" #include "inputstr.h"
#include "dix.h" #include "dix.h"
#include "XKBstr.h" #include <X11/extensions/XKBstr.h>
#define XKBSRV_NEED_FILE_FUNCS #define XKBSRV_NEED_FILE_FUNCS
#include "XKBsrv.h" #include <X11/extensions/XKBsrv.h>
#endif #endif

11
xkb/xkbconfig.c
View File

@ -28,11 +28,10 @@
#ifdef HAVE_DIX_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h> #include <dix-config.h>
#endif #elif defined(HAVE_CONFIG_H)
#ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
#include <stdlib.h> #include <stdlib.h>
@ -51,15 +50,15 @@
#else #else
#include "X.h" #include <X11/X.h>
#define NEED_EVENTS #define NEED_EVENTS
#include <X11/keysym.h> #include <X11/keysym.h>
#include "Xproto.h" #include <X11/Xproto.h>
#include "misc.h" #include "misc.h"
#include "inputstr.h" #include "inputstr.h"
#include "dix.h" #include "dix.h"
#define XKBSRV_NEED_FILE_FUNCS #define XKBSRV_NEED_FILE_FUNCS
#include "XKBsrv.h" #include <X11/extensions/XKBsrv.h>
#endif #endif
#include <X11/extensions/XKBconfig.h> #include <X11/extensions/XKBconfig.h>

5
xkb/xkberrs.c
View File

@ -28,11 +28,10 @@
#ifdef HAVE_DIX_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h> #include <dix-config.h>
#endif #elif defined(HAVE_CONFIG_H)
#ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
#include <stdlib.h> #include <stdlib.h>

13
xkb/xkbfmisc.c
View File

@ -28,11 +28,10 @@
#ifdef HAVE_DIX_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h> #include <dix-config.h>
#endif #elif defined(HAVE_CONFIG_H)
#ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
#include <stdlib.h> #include <stdlib.h>
@ -51,16 +50,16 @@
#else #else
#include "X.h" #include <X11/X.h>
#define NEED_EVENTS #define NEED_EVENTS
#include <X11/keysym.h> #include <X11/keysym.h>
#include "Xproto.h" #include <X11/Xproto.h>
#include "misc.h" #include "misc.h"
#include "inputstr.h" #include "inputstr.h"
#include "dix.h" #include "dix.h"
#include "XKBstr.h" #include <X11/extensions/XKBstr.h>
#define XKBSRV_NEED_FILE_FUNCS 1 #define XKBSRV_NEED_FILE_FUNCS 1
#include "XKBsrv.h" #include <X11/extensions/XKBsrv.h>
#include <X11/extensions/XKBgeom.h> #include <X11/extensions/XKBgeom.h>
#include "xkb.h" #include "xkb.h"

15
xkb/xkbout.c
View File

@ -28,11 +28,10 @@
#ifdef HAVE_DIX_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h> #include <dix-config.h>
#endif #elif defined(HAVE_CONFIG_H)
#ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
#include <stdlib.h> #include <stdlib.h>
@ -49,19 +48,19 @@
#else #else
#include "X.h" #include <X11/X.h>
#define NEED_EVENTS #define NEED_EVENTS
#include <X11/keysym.h> #include <X11/keysym.h>
#include "Xproto.h" #include <X11/Xproto.h>
#include "misc.h" #include "misc.h"
#include "inputstr.h" #include "inputstr.h"
#include "dix.h" #include "dix.h"
#include "XKBstr.h" #include <X11/extensions/XKBstr.h>
#define XKBSRV_NEED_FILE_FUNCS 1 #define XKBSRV_NEED_FILE_FUNCS 1
#include "XKBsrv.h" #include <X11/extensions/XKBsrv.h>
#include <X11/extensions/XKBgeom.h> #include <X11/extensions/XKBgeom.h>
#include "extensions/XKBfile.h" #include <X11/extensions/XKBfile.h>
#endif #endif

15
xkb/xkbtext.c
View File

@ -28,11 +28,10 @@
#ifdef HAVE_DIX_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h> #include <dix-config.h>
#endif #elif defined(HAVE_CONFIG_H)
#ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
#include <stdlib.h> #include <stdlib.h>
@ -50,16 +49,16 @@
#else #else
#include "X.h" #include <X11/X.h>
#define NEED_EVENTS #define NEED_EVENTS
#include "Xproto.h" #include <X11/Xproto.h>
#include "misc.h" #include "misc.h"
#include "inputstr.h" #include "inputstr.h"
#include "dix.h" #include "dix.h"
#include "XKBstr.h" #include <X11/extensions/XKBstr.h>
#define XKBSRV_NEED_FILE_FUNCS 1 #define XKBSRV_NEED_FILE_FUNCS 1
#include "XKBsrv.h" #include <X11/extensions/XKBsrv.h>
#include "XKBgeom.h" #include <X11/extensions/XKBgeom.h>
#endif #endif

15
xkb/xkmread.c
View File

@ -28,11 +28,10 @@
#ifdef HAVE_DIX_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h> #include <dix-config.h>
#endif #elif defined(HAVE_CONFIG_H)
#ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#include <stdio.h> #include <stdio.h>
#include <X11/Xos.h> #include <X11/Xos.h>
@ -52,16 +51,16 @@
#else #else
#include "X.h" #include <X11/X.h>
#define NEED_EVENTS #define NEED_EVENTS
#include "Xproto.h" #include <X11/Xproto.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include "misc.h" #include "misc.h"
#include "inputstr.h" #include "inputstr.h"
#include "XKBstr.h" #include <X11/extensions/XKBstr.h>
#define XKBSRV_NEED_FILE_FUNCS #define XKBSRV_NEED_FILE_FUNCS
#include "XKBsrv.h" #include <X11/extensions/XKBsrv.h>
#include "XKBgeom.h" #include <X11/extensions/XKBgeom.h>
Atom Atom
XkbInternAtom(Display *dpy,char *str,Bool only_if_exists) XkbInternAtom(Display *dpy,char *str,Bool only_if_exists)