diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:40 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:40 +0000 |
| commit | 44999e526a31721b0ed75ad6047948da837be4e0 (patch) | |
| tree | afa2e6b416645bc84cbc07f017b26dafc69c14fa /include | |
| parent | 94817d4f3277d927bf96431c24033d8cd67d9a30 (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branch
Diffstat (limited to 'include')
| -rw-r--r-- | include/X11/fonts/fontmisc.h | 5 | ||||
| -rw-r--r-- | include/X11/fonts/pcf.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/X11/fonts/fontmisc.h b/include/X11/fonts/fontmisc.h index 6439ba1..e6f2540 100644 --- a/include/X11/fonts/fontmisc.h +++ b/include/X11/fonts/fontmisc.h @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/include/fontmisc.h,v 3.16 2001/12/14 19:56:54 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/fontmisc.h,v 3.17 2003/09/13 21:33:02 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium @@ -68,7 +68,8 @@ extern Atom MakeAtom ( char *string, unsigned len, int makeit ); extern int ValidAtom ( Atom atom ); extern char *NameForAtom (Atom atom); -#ifndef OS_H +#ifndef _HAVE_XALLOC_DECLS +#define _HAVE_XALLOC_DECLS extern pointer Xalloc(unsigned long); extern pointer Xrealloc(pointer, unsigned long); extern void Xfree(pointer); diff --git a/include/X11/fonts/pcf.h b/include/X11/fonts/pcf.h index 57f739d..c627bf8 100644 --- a/include/X11/fonts/pcf.h +++ b/include/X11/fonts/pcf.h @@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/pcf.h,v 1.4 2001/12/14 19:56:47 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/pcf.h,v 1.5 2003/11/18 01:17:04 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium @@ -95,5 +95,6 @@ extern int pcfReadFontInfo ( FontInfoPtr pFontInfo, FontFilePtr file ); extern int pmfReadFont ( FontPtr pFont, FontFilePtr file, int bit, int byte, int glyph, int scan ); extern int pcfWriteFont ( FontPtr pFont, FontFilePtr file ); +extern void pcfError ( const char *, ... ); #endif /* _PCF_H_ */ |