aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/os
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-03-28 18:36:59 +0000
committermarha <marha@users.sourceforge.net>2010-03-28 18:36:59 +0000
commitec2f03bcf805b62d93d3d95c184e671e9e32f9c3 (patch)
tree043dc4679579e3fb114bbe44443d6745b184d84c /xorg-server/os
parent447df0677e8b9998c47d541a041f0a6bb480e601 (diff)
downloadvcxsrv-ec2f03bcf805b62d93d3d95c184e671e9e32f9c3.tar.gz
vcxsrv-ec2f03bcf805b62d93d3d95c184e671e9e32f9c3.tar.bz2
vcxsrv-ec2f03bcf805b62d93d3d95c184e671e9e32f9c3.zip
svn merge -r509:HEAD ^/branches/released .
Diffstat (limited to 'xorg-server/os')
-rw-r--r--xorg-server/os/log.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/xorg-server/os/log.c b/xorg-server/os/log.c
index 1b7472b70..6e9b183b8 100644
--- a/xorg-server/os/log.c
+++ b/xorg-server/os/log.c
@@ -105,8 +105,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
#endif
#ifdef XF86BIGFONT
-#define _XF86BIGFONT_SERVER_
-#include <X11/extensions/xf86bigfont.h>
+#include "xf86bigfontsrv.h"
#endif
#ifdef DDXOSVERRORF