andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Conditionalise usage of Xprint functions and headers.

Browse Source
This commit is contained in:
Daniel Stone 2005-04-20 12:49:46 +00:00
parent 2cdfab0ed7
commit 956dfa22f6
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dix/main.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.6 2005/03/23 19:58:45 gisburn Exp $ */ /* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.7 2005/04/20 12:25:19 daniels Exp $ */
/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.43 2003/10/30 21:21:02 herrb Exp $ */ /* $XFree86: xc/programs/Xserver/dix/main.c,v 3.43 2003/10/30 21:21:02 herrb Exp $ */
/*********************************************************** /***********************************************************
@ -100,7 +100,9 @@ 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
@ -249,7 +251,9 @@ 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
@ -361,7 +365,9 @@ 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");