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 /miext/damage | |
| 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 'miext/damage')
| -rwxr-xr-x | miext/damage/damage.c | 8 | ||||
| -rwxr-xr-x | miext/damage/damage.h | 4 | ||||
| -rwxr-xr-x | miext/damage/damagestr.h | 4 |
3 files changed, 14 insertions, 2 deletions
diff --git a/miext/damage/damage.c b/miext/damage/damage.c index 31238cc4a..dfebffe90 100755 --- a/miext/damage/damage.c +++ b/miext/damage/damage.c @@ -22,15 +22,19 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include <X11/fonts/font.h> #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "mi.h" #include "regionstr.h" #include "globals.h" diff --git a/miext/damage/damage.h b/miext/damage/damage.h index 7ed1b1823..c760f6bef 100755 --- a/miext/damage/damage.h +++ b/miext/damage/damage.h @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _DAMAGE_H_ #define _DAMAGE_H_ diff --git a/miext/damage/damagestr.h b/miext/damage/damagestr.h index 39b50660a..772a7ec35 100755 --- a/miext/damage/damagestr.h +++ b/miext/damage/damagestr.h @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _DAMAGESTR_H_ #define _DAMAGESTR_H_ |