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 /composite | |
| 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 'composite')
| -rw-r--r-- | composite/compalloc.c | 4 | ||||
| -rw-r--r-- | composite/compext.c | 4 | ||||
| -rw-r--r-- | composite/compinit.c | 4 | ||||
| -rw-r--r-- | composite/compint.h | 4 | ||||
| -rw-r--r-- | composite/compwindow.c | 4 |
5 files changed, 20 insertions, 0 deletions
diff --git a/composite/compalloc.c b/composite/compalloc.c index 2e4eeb0c7..005c16209 100644 --- a/composite/compalloc.c +++ b/composite/compalloc.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/composite/compext.c b/composite/compext.c index 477066024..e2b316edd 100644 --- a/composite/compext.c +++ b/composite/compext.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/composite/compinit.c b/composite/compinit.c index 5109a74fa..bc4099ba7 100644 --- a/composite/compinit.c +++ b/composite/compinit.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/composite/compint.h b/composite/compint.h index c5f283c95..989e5ed94 100644 --- a/composite/compint.h +++ b/composite/compint.h @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _COMPINT_H_ #define _COMPINT_H_ diff --git a/composite/compwindow.c b/composite/compwindow.c index c7ea98c13..f12cdf7ae 100644 --- a/composite/compwindow.c +++ b/composite/compwindow.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif |