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

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 */