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 /XTrap | |
| 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 'XTrap')
| -rw-r--r-- | XTrap/xtrapddmi.c | 4 | ||||
| -rw-r--r-- | XTrap/xtrapdi.c | 4 | ||||
| -rw-r--r-- | XTrap/xtrapdiswp.c | 4 | ||||
| -rw-r--r-- | XTrap/xtrapditbl.c | 4 |
4 files changed, 16 insertions, 0 deletions
diff --git a/XTrap/xtrapddmi.c b/XTrap/xtrapddmi.c index 240705989..2dba356b7 100644 --- a/XTrap/xtrapddmi.c +++ b/XTrap/xtrapddmi.c @@ -38,6 +38,10 @@ SOFTWARE. * */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef EXTMODULE #include <errno.h> #include <X11/Xos.h> diff --git a/XTrap/xtrapdi.c b/XTrap/xtrapdi.c index 8019addea..1435dcd80 100644 --- a/XTrap/xtrapdi.c +++ b/XTrap/xtrapdi.c @@ -51,6 +51,10 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef EXTMODULE #include <stdio.h> #include <errno.h> diff --git a/XTrap/xtrapdiswp.c b/XTrap/xtrapdiswp.c index 5f8709480..77aa0f1a3 100644 --- a/XTrap/xtrapdiswp.c +++ b/XTrap/xtrapdiswp.c @@ -45,6 +45,10 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #define NEED_REPLIES #define NEED_EVENTS diff --git a/XTrap/xtrapditbl.c b/XTrap/xtrapditbl.c index 1e2a14960..ae1586028 100644 --- a/XTrap/xtrapditbl.c +++ b/XTrap/xtrapditbl.c @@ -35,6 +35,10 @@ SOFTWARE. /*-----------------* * Include Files * *-----------------*/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #define NEED_REPLIES #define NEED_EVENTS |