From ec2f03bcf805b62d93d3d95c184e671e9e32f9c3 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sun, 28 Mar 2010 18:36:59 +0000
Subject: svn merge -r509:HEAD ^/branches/released .

---
 xorg-server/os/log.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'xorg-server/os')

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
-- 
cgit v1.2.3