hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-15 19:22:22 +00:00
Code Issues Projects Releases Wiki Activity

xc/programs/Xserver/Imakefile

Browse source 
xc/programs/Xserver/Xprint/DiPrint.h
xc/programs/Xserver/Xprint/Imakefile
xc/programs/Xserver/Xprint/Init.c
xc/programs/Xserver/Xprint/ddxInit.c
xc/programs/Xserver/dix/Imakefile
xc/programs/Xserver/dix/main.c
xc/programs/Xserver/dix/xpstubs.c
xc/programs/Xserver/os/Imakefile
//bugs.freedesktop.org/show_bug.cgi?id=2792) attachment #2193
    (https://bugs.freedesktop.org/attachment.cgi?id=2193) Fix build bustage
    when |PrintOnlyServer| is set to |NO|. Patch by Roland Mainz
    <roland.mainz@nrubsig.org> and Julien Lafon <julien.lafon@gmail.com>.
This commit is contained in:
Roland Mainz 2005-03-23 19:58:45 +00:00
commit 26aec10ada
6 changed files with 53 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dix/main.c
View file

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.4 2004/09/18 23:18:35 gisburn Exp $ */
/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.5 2005/03/07 23:02:58 gisburn Exp $ */
/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.43 2003/10/30 21:21:02 herrb Exp $ */
/***********************************************************
@ -100,6 +100,7 @@ Equipment Corporation.
#include "site.h"
#include "dixfont.h"
#include "extnsionst.h"
#include "DiPrint.h"
#ifdef PANORAMIX
#include "panoramiXsrv.h"
#else
@ -248,6 +249,7 @@ main(int argc, char *argv[], char *envp[])
display = "0";
InitGlobals();
PrinterInitGlobals();
/* 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
@ -359,13 +361,12 @@ main(int argc, char *argv[], char *envp[])
InitCallbackManager();
InitVisualWrap();
InitOutput(&screenInfo, argc, argv);
PrinterInitOutput(&screenInfo, argc, argv);
if (screenInfo.numScreens < 1)
FatalError("no screens found");
if (screenInfo.numVideoScreens < 0)
screenInfo.numVideoScreens = screenInfo.numScreens;
#ifdef XPRINT
PrinterInitOutput(&screenInfo, argc, argv);
#endif
InitExtensions(argc, argv);
if (!InitClientPrivates(serverClient))
FatalError("failed to allocate serverClient devprivates");