//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).
This commit is contained in:
parent
39eb279718
commit
13fcfee373
|
@ -100,9 +100,7 @@ Equipment Corporation.
|
||||||
#include "site.h"
|
#include "site.h"
|
||||||
#include "dixfont.h"
|
#include "dixfont.h"
|
||||||
#include "extnsionst.h"
|
#include "extnsionst.h"
|
||||||
#ifdef XPRINT
|
|
||||||
#include "DiPrint.h"
|
#include "DiPrint.h"
|
||||||
#endif
|
|
||||||
#ifdef PANORAMIX
|
#ifdef PANORAMIX
|
||||||
#include "panoramiXsrv.h"
|
#include "panoramiXsrv.h"
|
||||||
#else
|
#else
|
||||||
|
@ -251,9 +249,7 @@ main(int argc, char *argv[], char *envp[])
|
||||||
display = "0";
|
display = "0";
|
||||||
|
|
||||||
InitGlobals();
|
InitGlobals();
|
||||||
#ifdef XPRINT
|
|
||||||
PrinterInitGlobals();
|
PrinterInitGlobals();
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Quartz support on Mac OS X requires that the Cocoa event loop be in
|
/* 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
|
* 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();
|
InitCallbackManager();
|
||||||
InitVisualWrap();
|
InitVisualWrap();
|
||||||
InitOutput(&screenInfo, argc, argv);
|
InitOutput(&screenInfo, argc, argv);
|
||||||
#ifdef XPRINT
|
|
||||||
PrinterInitOutput(&screenInfo, argc, argv);
|
PrinterInitOutput(&screenInfo, argc, argv);
|
||||||
#endif
|
|
||||||
|
|
||||||
if (screenInfo.numScreens < 1)
|
if (screenInfo.numScreens < 1)
|
||||||
FatalError("no screens found");
|
FatalError("no screens found");
|
||||||
|
|
Loading…
Reference in New Issue