diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2005-07-03 07:01:00 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2005-07-03 07:01:00 +0000 |
| commit | 0767d4880359983cbe83a4ea396d81efb5d6882b (patch) | |
| tree | 70bb4754f58de6a20179ca95057b02e5ea1fa251 | |
| parent | f6c6acf593686015fa639e3583f70cc6d5f5d7b3 (diff) | |
Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.XORG-6_8_99_14
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/encparse.c | 6 | ||||
| -rw-r--r-- | src/fontenc.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/encparse.c b/src/encparse.c index acf17f2..ba7611b 100644 --- a/src/encparse.c +++ b/src/encparse.c @@ -38,8 +38,8 @@ THE SOFTWARE. #ifndef FONTENC_NO_LIBFONT -#include "fntfilio.h" -#include "fntfilst.h" +#include <X11/fonts/fntfilio.h> +#include <X11/fonts/fntfilst.h> #else @@ -59,7 +59,7 @@ typedef gzFile FontFilePtr; #endif -#include "fontenc.h" +#include <X11/fonts/fontenc.h> #include "fontencI.h" #define MAXALIASES 20 diff --git a/src/fontenc.c b/src/fontenc.c index 4636512..3a7cc96 100644 --- a/src/fontenc.c +++ b/src/fontenc.c @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XdotOrg: xc/lib/font/fontfile/fontenc.c,v 1.16 2003/12/19 02:05:38 dawes Exp $ */ +/* $XdotOrg: xc/lib/font/fontfile/fontenc.c,v 1.2 2004/04/23 18:44:21 eich Exp $ */ /* $XFree86: xc/lib/font/fontfile/fontenc.c,v 1.15 2003/02/20 03:25:19 dawes Exp $ */ /* Backend-independent encoding code */ @@ -33,8 +33,8 @@ THE SOFTWARE. #ifndef FONTENC_NO_LIBFONT -#include "fontmisc.h" /* defines xalloc and friends */ -#include "fntfilst.h" +#include <X11/fonts/fontmisc.h> /* defines xalloc and friends */ +#include <X11/fonts/fntfilst.h> #else @@ -49,7 +49,7 @@ THE SOFTWARE. #endif /* FONTENC_NO_FONTFILE */ -#include "fontenc.h" +#include <X11/fonts/fontenc.h> #include "fontencI.h" /* Functions local to this file */ |