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/xnest | |
| 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/xnest')
| -rw-r--r-- | hw/xnest/Font.c | 4 | ||||
| -rw-r--r-- | hw/xnest/GC.c | 2 | ||||
| -rw-r--r-- | hw/xnest/GCOps.c | 2 | ||||
| -rw-r--r-- | hw/xnest/Init.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c index f78234ea0..d5ce79f85 100644 --- a/hw/xnest/Font.c +++ b/hw/xnest/Font.c @@ -19,8 +19,8 @@ is" without express or implied warranty. #include <X11/Xproto.h> #include <X11/misc.h> #include "regionstr.h" -#include "font.h" -#include "fontstruct.h" +#include <X11/fonts/font.h> +#include <X11/fonts/fontstruct.h> #include "scrnintstr.h" #include "Xnest.h" diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c index f9f8ab9a1..8ef90588f 100644 --- a/hw/xnest/GC.c +++ b/hw/xnest/GC.c @@ -20,7 +20,7 @@ is" without express or implied warranty. #include "windowstr.h" #include "pixmapstr.h" #include "scrnintstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "mistruct.h" #include "region.h" diff --git a/hw/xnest/GCOps.c b/hw/xnest/GCOps.c index b3cccc2d5..0e80f7118 100644 --- a/hw/xnest/GCOps.c +++ b/hw/xnest/GCOps.c @@ -17,7 +17,7 @@ is" without express or implied warranty. #include <X11/X.h> #include <X11/Xproto.h> #include "regionstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "gcstruct.h" #include "scrnintstr.h" #include "windowstr.h" diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c index eaf1f5609..3e9a4bd9b 100644 --- a/hw/xnest/Init.c +++ b/hw/xnest/Init.c @@ -23,7 +23,7 @@ is" without express or implied warranty. #include "windowstr.h" #include "servermd.h" #include "mi.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "Xnest.h" |