diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2005-07-03 07:01:01 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2005-07-03 07:01:01 +0000 |
| commit | 932edb23b47440397447265bf72ad7932fd80070 (patch) | |
| tree | 16cda22a6b6b9e9a8ca05a9946dc66f4edf34293 /include | |
| parent | b03d67fd1612a0df5132b10dd0bd9b2cec053a39 (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 'include')
| -rw-r--r-- | include/X11/fonts/bitmap.h | 2 | ||||
| -rw-r--r-- | include/X11/fonts/fntfil.h | 2 | ||||
| -rw-r--r-- | include/X11/fonts/fntfilio.h | 2 | ||||
| -rw-r--r-- | include/X11/fonts/fntfilst.h | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/X11/fonts/bitmap.h b/include/X11/fonts/bitmap.h index b5df964..e60fda8 100644 --- a/include/X11/fonts/bitmap.h +++ b/include/X11/fonts/bitmap.h @@ -36,7 +36,7 @@ from The Open Group. #ifndef _BITMAP_H_ #define _BITMAP_H_ -#include "fntfilio.h" +#include <X11/fonts/fntfilio.h> #ifndef FONTMODULE #include <stdio.h> /* just for NULL */ #else diff --git a/include/X11/fonts/fntfil.h b/include/X11/fonts/fntfil.h index 80ec872..81d2cbc 100644 --- a/include/X11/fonts/fntfil.h +++ b/include/X11/fonts/fntfil.h @@ -34,7 +34,7 @@ in this Software without prior written authorization from The Open Group. #ifndef _FONTFILE_H_ #define _FONTFILE_H_ -#include "fontxlfd.h" +#include <X11/fonts/fontxlfd.h> typedef struct _FontEntry *FontEntryPtr; typedef struct _FontTable *FontTablePtr; diff --git a/include/X11/fonts/fntfilio.h b/include/X11/fonts/fntfilio.h index 30a95c5..f8e24f3 100644 --- a/include/X11/fonts/fntfilio.h +++ b/include/X11/fonts/fntfilio.h @@ -34,7 +34,7 @@ in this Software without prior written authorization from The Open Group. #ifndef _FNTFILIO_H_ #define _FNTFILIO_H_ -#include "bufio.h" +#include <X11/fonts/bufio.h> typedef BufFilePtr FontFilePtr; diff --git a/include/X11/fonts/fntfilst.h b/include/X11/fonts/fntfilst.h index cfe555a..1a71eae 100644 --- a/include/X11/fonts/fntfilst.h +++ b/include/X11/fonts/fntfilst.h @@ -38,11 +38,11 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xos.h> #endif #ifndef XP_PSTEXT -#include "fontmisc.h" +#include <X11/fonts/fontmisc.h> #endif #include <X11/fonts/fontstruct.h> -#include "fontxlfd.h" -#include "fntfil.h" +#include <X11/fonts/fontxlfd.h> +#include <X11/fonts/fntfil.h> typedef struct _FontName { char *name; |