summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Mainz <roland.mainz@nrubsig.org>2005-04-23 22:55:40 +0000
committerRoland Mainz <roland.mainz@nrubsig.org>2005-04-23 22:55:40 +0000
commit13fcfee37305f46e95ff81d7d5eec4d88a63a63b (patch)
tree4a937c0848949c7a8f2a57b2264648f1921de5b7
parent39eb2797183bf871a2dd01bff63dd35c146471f5 (diff)
//bugs.freedesktop.org/show_bug.cgi?id=3118) attachment #2525
(https://bugs.freedesktop.org/attachment.cgi?id=2525) Get Xprint server working again which was broken by the 05/04/20 05:49:46 commit commit (the CPP symbol |XPRINT| is not universally available when building the Xserver and should be used with care).
-rw-r--r--dix/main.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/dix/main.c b/dix/main.c
index 41c626ca6..863055270 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -100,9 +100,7 @@ Equipment Corporation.
#include "site.h"
#include "dixfont.h"
#include "extnsionst.h"
-#ifdef XPRINT
#include "DiPrint.h"
-#endif
#ifdef PANORAMIX
#include "panoramiXsrv.h"
#else
@@ -251,9 +249,7 @@ main(int argc, char *argv[], char *envp[])
display = "0";
InitGlobals();
-#ifdef XPRINT
PrinterInitGlobals();
-#endif
/* Quartz support on Mac OS X requires that the Cocoa event loop be in
* the main thread. This allows the X server main to be called again
@@ -365,9 +361,7 @@ main(int argc, char *argv[], char *envp[])
InitCallbackManager();
InitVisualWrap();
InitOutput(&screenInfo, argc, argv);
-#ifdef XPRINT
PrinterInitOutput(&screenInfo, argc, argv);
-#endif
if (screenInfo.numScreens < 1)
FatalError("no screens found");