diff options
| author | Roland Mainz <roland.mainz@nrubsig.org> | 2005-03-23 19:58:45 +0000 |
|---|---|---|
| committer | Roland Mainz <roland.mainz@nrubsig.org> | 2005-03-23 19:58:45 +0000 |
| commit | 26aec10adad51deb35a8398abb884d90be077a6b (patch) | |
| tree | b5864964b1193e604f56598e73b6a5fcec94915f /dix | |
| parent | ac18f8e308221af368fd4153b4eee7b89f8dd4bc (diff) | |
xc/programs/Xserver/Imakefile
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>.
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/main.c | 9 | ||||
| -rw-r--r-- | dix/xpstubs.c | 18 |
2 files changed, 22 insertions, 5 deletions
diff --git a/dix/main.c b/dix/main.c index 5614c5dbb..504602ead 100644 --- a/dix/main.c +++ b/dix/main.c @@ -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"); diff --git a/dix/xpstubs.c b/dix/xpstubs.c index dac3205fb..d04be0969 100644 --- a/dix/xpstubs.c +++ b/dix/xpstubs.c @@ -29,6 +29,7 @@ from The Open Group. #include "misc.h" #include "font.h" +#include "DiPrint.h" Bool XpClientIsBitmapClient( @@ -45,10 +46,25 @@ XpClientIsPrintClient( return FALSE; } int -XprintOptions( +PrinterOptions( int argc, char **argv, int i) { return i; } +void +PrinterInitOutput( + ScreenInfo *pScreenInfo, + int argc, + char **argv) +{ +} +void PrinterUseMsg(void) +{ +} +void PrinterInitGlobals(void) +{ +} + + |