diff options
author | marha <marha@users.sourceforge.net> | 2010-03-28 18:36:59 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-03-28 18:36:59 +0000 |
commit | ec2f03bcf805b62d93d3d95c184e671e9e32f9c3 (patch) | |
tree | 043dc4679579e3fb114bbe44443d6745b184d84c /xorg-server/dix/dixfonts.c | |
parent | 447df0677e8b9998c47d541a041f0a6bb480e601 (diff) | |
download | vcxsrv-ec2f03bcf805b62d93d3d95c184e671e9e32f9c3.tar.gz vcxsrv-ec2f03bcf805b62d93d3d95c184e671e9e32f9c3.tar.bz2 vcxsrv-ec2f03bcf805b62d93d3d95c184e671e9e32f9c3.zip |
svn merge -r509:HEAD ^/branches/released .
Diffstat (limited to 'xorg-server/dix/dixfonts.c')
-rw-r--r-- | xorg-server/dix/dixfonts.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/xorg-server/dix/dixfonts.c b/xorg-server/dix/dixfonts.c index 77c166ee5..8dec11d92 100644 --- a/xorg-server/dix/dixfonts.c +++ b/xorg-server/dix/dixfonts.c @@ -71,8 +71,7 @@ Equipment Corporation. #endif
#ifdef XF86BIGFONT
-#define _XF86BIGFONT_SERVER_
-#include <X11/extensions/xf86bigfont.h>
+#include "xf86bigfontsrv.h"
#endif
#define QUERYCHARINFO(pci, pr) *(pr) = (pci)->metrics
|