Commit 46b64bd5 authored by Daniel Stone's avatar Daniel Stone
Browse files

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

parent e0319897
......@@ -26,9 +26,6 @@
#include <dix-config.h>
#endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "compint.h"
void
......
......@@ -26,9 +26,6 @@
#include <dix-config.h>
#endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "compint.h"
static CARD8 CompositeReqCode;
......
......@@ -26,9 +26,6 @@
#include <dix-config.h>
#endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "compint.h"
int CompScreenPrivateIndex;
......
......@@ -26,9 +26,6 @@
#include <dix-config.h>
#endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "compint.h"
#ifdef COMPOSITE_DEBUG
......
......@@ -26,9 +26,6 @@
#include <dix-config.h>
#endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "damageextint.h"
unsigned char DamageReqCode;
......
......@@ -24,13 +24,11 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE.
*/
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "fb.h"
#ifdef RENDER
......
......@@ -26,9 +26,6 @@
#include <dix-config.h>
#endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "fb.h"
#ifdef RENDER
......
......@@ -26,9 +26,6 @@
#include <dix-config.h>
#endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <X11/X.h>
#include "scrnintstr.h"
#include "windowstr.h"
......
......@@ -26,9 +26,6 @@
#include <dix-config.h>
#endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <X11/misc.h>
#include "scrnintstr.h"
#include <X11/os.h>
......
......@@ -27,9 +27,6 @@
#include <dix-config.h>
#endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <X11/misc.h>
#include "scrnintstr.h"
#include <X11/os.h>
......
......@@ -26,9 +26,6 @@
#include <dix-config.h>
#endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "xfixesint.h"
#include "scrnintstr.h"
#include "cursorstr.h"
......
......@@ -26,9 +26,6 @@
#include <dix-config.h>
#endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "xfixesint.h"
#include "scrnintstr.h"
#ifdef RENDER
......
......@@ -26,9 +26,6 @@
#include <dix-config.h>
#endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "xfixesint.h"
int
......
......@@ -26,9 +26,6 @@
#include <dix-config.h>
#endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "xfixesint.h"
static RESTYPE SelectionClientType, SelectionWindowType;
......
......@@ -26,9 +26,6 @@
#include <dix-config.h>
#endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "xfixesint.h"
unsigned char XFixesReqCode;
......
......@@ -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 */
......
......@@ -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 $ */
#define NEED_EVENTS
#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#elif defined(HAVE_CONFIG_H)
#include <config.h>
#endif
#define NEED_EVENTS
#define NEED_REPLIES
#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 */
......
......@@ -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 */
......
......@@ -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 */
......
......@@ -28,11 +28,10 @@
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifdef HAVE_CONFIG_H
#elif defined(HAVE_CONFIG_H)
#include <config.h>
#endif
#include <stdio.h>
#include <ctype.h>
#include <stdlib.h>
......@@ -67,9 +66,9 @@
#include "misc.h"
#include "inputstr.h"
#include "dix.h"
#include "XKBstr.h"
#include <X11/extensions/XKBstr.h>
#define XKBSRV_NEED_FILE_FUNCS
#include "XKBsrv.h"
#include <X11/extensions/XKBsrv.h>
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment