diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2005-07-03 07:01:01 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2005-07-03 07:01:01 +0000 |
| commit | 70a39df3be6fcfea3746e0e127f3cde03a538869 (patch) | |
| tree | f14dd8c424cae5532bf439b20e4ef6d14bdf0737 | |
| parent | abca6e76c667a201bf23b73bd681a8c4da892e62 (diff) | |
Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
source files in the xserver/xorg tree, predicated on defines of
HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
<X11/fonts/foo.h>.
| -rw-r--r-- | src/maprules.c | 4 | ||||
| -rw-r--r-- | src/xkbconfig.c | 4 | ||||
| -rw-r--r-- | src/xkberrs.c | 4 | ||||
| -rw-r--r-- | src/xkbmisc.c | 4 | ||||
| -rw-r--r-- | src/xkbout.c | 4 | ||||
| -rw-r--r-- | src/xkbtext.c | 4 | ||||
| -rw-r--r-- | src/xkmread.c | 4 |
7 files changed, 28 insertions, 0 deletions
diff --git a/src/maprules.c b/src/maprules.c index e7e369d..03ca51e 100644 --- a/src/maprules.c +++ b/src/maprules.c @@ -26,6 +26,10 @@ ********************************************************/ /* $XFree86: xc/lib/xkbfile/maprules.c,v 3.17 2002/11/26 01:43:25 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/src/xkbconfig.c b/src/xkbconfig.c index 3c01fa8..3d582d1 100644 --- a/src/xkbconfig.c +++ b/src/xkbconfig.c @@ -26,6 +26,10 @@ ********************************************************/ /* $XFree86: xc/lib/xkbfile/xkbconfig.c,v 3.7 2001/11/30 12:11:51 eich Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/src/xkberrs.c b/src/xkberrs.c index 08b44f2..731d0b5 100644 --- a/src/xkberrs.c +++ b/src/xkberrs.c @@ -26,6 +26,10 @@ ********************************************************/ /* $XFree86: xc/lib/xkbfile/xkberrs.c,v 3.4 2001/07/29 05:01:13 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/src/xkbmisc.c b/src/xkbmisc.c index c1d1368..f55ab5b 100644 --- a/src/xkbmisc.c +++ b/src/xkbmisc.c @@ -26,6 +26,10 @@ ********************************************************/ /* $XFree86: xc/lib/xkbfile/xkbmisc.c,v 1.7 2003/07/16 02:31:10 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/src/xkbout.c b/src/xkbout.c index 059959a..cdf6995 100644 --- a/src/xkbout.c +++ b/src/xkbout.c @@ -26,6 +26,10 @@ ********************************************************/ /* $XFree86: xc/lib/xkbfile/xkbout.c,v 3.9 2001/10/28 03:32:47 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/src/xkbtext.c b/src/xkbtext.c index 86df1cb..0df7c89 100644 --- a/src/xkbtext.c +++ b/src/xkbtext.c @@ -26,6 +26,10 @@ ********************************************************/ /* $XFree86: xc/lib/xkbfile/xkbtext.c,v 3.11 2002/12/21 18:49:02 paulo Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/src/xkmread.c b/src/xkmread.c index a69058a..3f38a4f 100644 --- a/src/xkmread.c +++ b/src/xkmread.c @@ -26,6 +26,10 @@ ********************************************************/ /* $XFree86: xc/lib/xkbfile/xkmread.c,v 1.6 2002/02/13 22:09:42 herrb Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif |