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 /hw/dmx | |
| 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 'hw/dmx')
| -rw-r--r-- | hw/dmx/dmx.c | 4 | ||||
| -rw-r--r-- | hw/dmx/dmxfont.c | 2 | ||||
| -rw-r--r-- | hw/dmx/dmxfont.h | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/hw/dmx/dmx.c b/hw/dmx/dmx.c index 1731b92cd..57673d746 100644 --- a/hw/dmx/dmx.c +++ b/hw/dmx/dmx.c @@ -43,6 +43,10 @@ * Please see the Client-to-Server DMX Extension to the X Protocol * document for details about the protocol. */ +#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/hw/dmx/dmxfont.c b/hw/dmx/dmxfont.c index 171d306c3..4ce736bf8 100644 --- a/hw/dmx/dmxfont.c +++ b/hw/dmx/dmxfont.c @@ -42,7 +42,7 @@ #include "dmxfont.h" #include "dmxlog.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfont.h" #include "dixstruct.h" diff --git a/hw/dmx/dmxfont.h b/hw/dmx/dmxfont.h index 9912db65c..f69aac196 100644 --- a/hw/dmx/dmxfont.h +++ b/hw/dmx/dmxfont.h @@ -38,7 +38,7 @@ #ifndef DMXFONT_H #define DMXFONT_H -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> /** Font private area. */ typedef struct _dmxFontPriv { |