xserver: Branch 'xorg-server-1.4-apple'

[George Peter Staplin]

 hw/xquartz/pbproxy/pbproxy.h |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 6bcbb9ba85d95d7df63811a482abc39c4d595366
Author: George Peter Staplin <gps at Georges-Workstation.local>
Date:   Thu Oct 23 17:56:46 2008 -0600

    XQuartz: pbproxy: pbproxy.h had invalid macro usage with 2 #else statements, so it wasn't building.  Fix the build.

diff --git a/hw/xquartz/pbproxy/pbproxy.h b/hw/xquartz/pbproxy/pbproxy.h
index 324d56c..60566a6 100644
--- a/hw/xquartz/pbproxy/pbproxy.h
+++ b/hw/xquartz/pbproxy/pbproxy.h
@@ -37,7 +37,6 @@ extern void x_input_run (void);
 # define DB(msg, args...) debug_printf("%s:%s:%d " msg, __FILE__, __FUNCTION__, __LINE__, ##args)
 #else
 # define DB(msg, args...) do {} while (0)
-#else
 #endif
 
 #define TRACE() DB("TRACE\n")