diff options
Diffstat (limited to 'xc/programs/Xserver/include/dixfont.h')
| -rw-r--r-- | xc/programs/Xserver/include/dixfont.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/xc/programs/Xserver/include/dixfont.h b/xc/programs/Xserver/include/dixfont.h index 89202698f..923d0ae30 100644 --- a/xc/programs/Xserver/include/dixfont.h +++ b/xc/programs/Xserver/include/dixfont.h @@ -1,4 +1,4 @@ -/* $XConsortium: dixfont.h /main/21 1996/09/28 17:14:16 rws $ */ +/* $Xorg: dixfont.h,v 1.3 2000/08/17 19:53:29 cpqbld Exp $ */ /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/dixfont.h,v 3.5 1999/08/21 13:48:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/dixfont.h,v 3.7 2001/02/02 21:39:02 herrb Exp $ */ #ifndef DIXFONT_H #define DIXFONT_H 1 @@ -118,6 +118,11 @@ extern int LoadGlyphs(ClientPtr /*client*/, extern void DeleteClientFontStuff(ClientPtr /*client*/); +/* Quartz support on Mac OS X pulls in the QuickDraw + framework whose InitFonts function conflicts here. */ +#ifdef __DARWIN__ +#define InitFonts Darwin_X_InitFonts +#endif extern void InitFonts(void); extern int GetDefaultPointSize(void); |