fdo-mirrors/xorg-libx11
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/lib/libx11.git synced 2026-05-09 07:18:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Daniel Stone 2005-07-03 07:37:33 +00:00
parent 8c7677138e
commit 726538ba21
4 changed files with 26 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/xkb/XKBAlloc.c
View file

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

21
src/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 $ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#elif defined(HAVE_CONFIG_H)
#include <config.h>
#endif
#define NEED_EVENTS
#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifndef XKB_IN_SERVER
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <stdio.h>
#include "Xlibint.h"
#include "XKBlibint.h"
@ -47,12 +46,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#else
#include <stdio.h>
#include "X.h"
#include "Xproto.h"
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
#include "inputstr.h"
#include "XKBsrv.h"
#include "XKBgeom.h"
#include <X11/extensions/XKBsrv.h>
#include <X11/extensions/XKBgeom.h>
#endif /* XKB_IN_SERVER */

11
src/xkb/XKBMAlloc.c
View file

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

11
src/xkb/XKBMisc.c
View file

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