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 /Xprint/ddxInit.c | |
| 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 'Xprint/ddxInit.c')
| -rw-r--r-- | Xprint/ddxInit.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/Xprint/ddxInit.c b/Xprint/ddxInit.c index 54f9b611a..6214c4ae5 100644 --- a/Xprint/ddxInit.c +++ b/Xprint/ddxInit.c @@ -81,9 +81,6 @@ InitOutput( pScreenInfo->numPixmapFormats = 0; /* get them in PrinterInitOutput */ screenInfo.numVideoScreens = 0; -#ifdef PRINT_ONLY_SERVER - PrinterInitOutput(pScreenInfo, argc, argv); -#endif } static void @@ -253,7 +250,7 @@ GetTimeInMillis(void) /* ddxInitGlobals - called by |InitGlobals| from os/util.c */ void ddxInitGlobals(void) { - XprintInitGlobals(); + PrinterInitGlobals(); } /**************************************** @@ -265,11 +262,6 @@ void ddxInitGlobals(void) void ddxUseMsg(void) { -/* Enable |XprintUseMsg()| only if |XprintOptions()| is called - * by |ddxProcessArgument|, too (see below...) */ -#ifdef PRINT_ONLY_SERVER - XprintUseMsg(); -#endif /* PRINT_ONLY_SERVER */ } void AbortDDX (void) @@ -286,11 +278,7 @@ ddxProcessArgument ( char *argv[], int i) { -#ifdef PRINT_ONLY_SERVER - return XprintOptions(argc, argv, i) - i; -#else return(0); -#endif } #ifdef XINPUT |