xserver: Branch 'master'

[Adam Jackson]

 glx/glxcmds.c                 |    1 -
 glx/glxcmdsswap.c             |    1 -
 hw/dmx/glxProxy/glxcmds.c     |    1 -
 hw/dmx/glxProxy/glxcmdsswap.c |    1 -
 hw/dmx/glxProxy/glxutil.c     |    1 -
 5 files changed, 5 deletions(-)

New commits:
commit ab5d1ae82ebd467d0a5b39821b286097865ba0c7
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Jun 2 13:39:55 2009 -0400

    Remove some libXfont leftovers

diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index 66b1ec7..d4ff7da 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -28,7 +28,6 @@
  * Silicon Graphics, Inc.
  */
 
-#define FONT_PCF
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
diff --git a/glx/glxcmdsswap.c b/glx/glxcmdsswap.c
index 4132b76..f1c0ce6 100644
--- a/glx/glxcmdsswap.c
+++ b/glx/glxcmdsswap.c
@@ -28,7 +28,6 @@
  * Silicon Graphics, Inc.
  */
 
-#define FONT_PCF
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
diff --git a/hw/dmx/glxProxy/glxcmds.c b/hw/dmx/glxProxy/glxcmds.c
index f19239f..31fd431 100644
--- a/hw/dmx/glxProxy/glxcmds.c
+++ b/hw/dmx/glxProxy/glxcmds.c
@@ -43,7 +43,6 @@
 #undef Xrealloc
 #undef Xfree
 
-#define FONT_PCF
 #include "glxserver.h"
 #include <GL/glxtokens.h>
 #include "g_disptab.h"
diff --git a/hw/dmx/glxProxy/glxcmdsswap.c b/hw/dmx/glxProxy/glxcmdsswap.c
index 702479f..b3720f6 100644
--- a/hw/dmx/glxProxy/glxcmdsswap.c
+++ b/hw/dmx/glxProxy/glxcmdsswap.c
@@ -28,7 +28,6 @@
  * Silicon Graphics, Inc.
  */
 
-#define FONT_PCF
 #include "glxserver.h"
 #include "glxutil.h"
 #include <GL/glxtokens.h>
diff --git a/hw/dmx/glxProxy/glxutil.c b/hw/dmx/glxProxy/glxutil.c
index 70f8b74..d0ce504 100644
--- a/hw/dmx/glxProxy/glxutil.c
+++ b/hw/dmx/glxProxy/glxutil.c
@@ -28,7 +28,6 @@
  * Silicon Graphics, Inc.
  */
 
-#define FONT_PCF
 #include "glxserver.h"
 #include <GL/glxtokens.h>
 #include <pixmapstr.h>