diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2005-07-03 07:02:09 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2005-07-03 07:02:09 +0000 |
| commit | e03198972ca78b03ad13cb49112c03a052bb763b (patch) | |
| tree | 1278f4b1a41b11511b0f5c2932191e44f0f9d8d3 /dbe | |
| parent | b8aef6c474ffc6d637bec178674898ea95ccde47 (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>.
Diffstat (limited to 'dbe')
| -rw-r--r-- | dbe/dbe.c | 4 | ||||
| -rw-r--r-- | dbe/dbestruct.h | 4 | ||||
| -rw-r--r-- | dbe/midbe.c | 4 | ||||
| -rw-r--r-- | dbe/midbe.h | 4 | ||||
| -rw-r--r-- | dbe/midbestr.h | 4 |
5 files changed, 20 insertions, 0 deletions
@@ -37,6 +37,10 @@ /* INCLUDES */ #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include "scrnintstr.h" diff --git a/dbe/dbestruct.h b/dbe/dbestruct.h index 13d09dea2..35deae8a9 100644 --- a/dbe/dbestruct.h +++ b/dbe/dbestruct.h @@ -33,6 +33,10 @@ /* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef DBE_STRUCT_H #define DBE_STRUCT_H diff --git a/dbe/midbe.c b/dbe/midbe.c index 48a42daee..c639583f1 100644 --- a/dbe/midbe.c +++ b/dbe/midbe.c @@ -37,6 +37,10 @@ #define NEED_REPLIES #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> diff --git a/dbe/midbe.h b/dbe/midbe.h index 3f9bb0090..1110578cd 100644 --- a/dbe/midbe.h +++ b/dbe/midbe.h @@ -33,6 +33,10 @@ /* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef MIDBE_H #define MIDBE_H diff --git a/dbe/midbestr.h b/dbe/midbestr.h index 8c351072e..248b44857 100644 --- a/dbe/midbestr.h +++ b/dbe/midbestr.h @@ -32,6 +32,10 @@ *****************************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef MIDBE_STRUCT_H #define MIDBE_STRUCT_H |