diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2005-07-03 07:01:27 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2005-07-03 07:01:27 +0000 |
| commit | 95f88d487422b022457a1d2f2611b10b77ed9b46 (patch) | |
| tree | 154555bedcb781ea4d556f853b490a0cf5ed30a3 | |
| parent | 632161e98ed1ce857d572d8b65bbd8be3bc5a15a (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>.
| -rw-r--r-- | src/ffb_gc.c | 4 | ||||
| -rw-r--r-- | src/ffb_glyph.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ffb_gc.c b/src/ffb_gc.c index 59cde91..2abca33 100644 --- a/src/ffb_gc.c +++ b/src/ffb_gc.c @@ -24,7 +24,7 @@ * USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gc.c,v 1.4 2003/06/23 17:35:48 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gc.c,v 1.2 2000/05/23 04:47:44 dawes Exp $ */ #include "ffb.h" #include "ffb_regs.h" @@ -35,7 +35,7 @@ #include "scrnintstr.h" #include "pixmapstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #define PSZ 8 diff --git a/src/ffb_glyph.c b/src/ffb_glyph.c index 76668e3..322456f 100644 --- a/src/ffb_glyph.c +++ b/src/ffb_glyph.c @@ -24,7 +24,7 @@ * USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_glyph.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_glyph.c,v 1.1 2000/05/18 23:21:37 dawes Exp $ */ #include "ffb.h" #include "ffb_regs.h" @@ -34,7 +34,7 @@ #include "pixmapstr.h" #include "scrnintstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #define PSZ 8 |