diff options
| author | Roland Mainz <roland.mainz@nrubsig.org> | 2005-04-24 01:10:12 +0000 |
|---|---|---|
| committer | Roland Mainz <roland.mainz@nrubsig.org> | 2005-04-24 01:10:12 +0000 |
| commit | a369d390a87ab0189c465be6cfd914e4b9329691 (patch) | |
| tree | 198ccfd7522d6ade85720689cd5d42ab5a62b64c | |
| parent | 13fcfee37305f46e95ff81d7d5eec4d88a63a63b (diff) | |
xc/config/cf/X11.tmplXORG-6_8_99_4
xc/programs/Xserver/Xext/Imakefile
xc/programs/Xserver/dix/Imakefile
xc/programs/Xserver/dix/main.c
xc/programs/Xserver/dix/xpstubs.c
xc/programs/Xserver/mi/miinitext.c
//bugs.freedesktop.org/show_bug.cgi?id=2792) attachment #2526
(https://bugs.freedesktop.org/attachment.cgi?id=2526) bug 2792 part II:
Make Xprint headers in dix/, mi/, os/ and Xext/ conditional on whether
the Xprint extension is build or not. Patch by Egbert Eich
<eich@freedesktop.org> and Roland Mainz <roland.mainz@nrubsig.org>.
| -rw-r--r-- | dix/main.c | 6 | ||||
| -rw-r--r-- | dix/xpstubs.c | 5 | ||||
| -rw-r--r-- | mi/miinitext.c | 4 | ||||
| -rw-r--r-- | os/utils.c | 4 |
4 files changed, 18 insertions, 1 deletions
diff --git a/dix/main.c b/dix/main.c index 863055270..41c626ca6 100644 --- a/dix/main.c +++ b/dix/main.c @@ -100,7 +100,9 @@ Equipment Corporation. #include "site.h" #include "dixfont.h" #include "extnsionst.h" +#ifdef XPRINT #include "DiPrint.h" +#endif #ifdef PANORAMIX #include "panoramiXsrv.h" #else @@ -249,7 +251,9 @@ main(int argc, char *argv[], char *envp[]) display = "0"; InitGlobals(); +#ifdef XPRINT PrinterInitGlobals(); +#endif /* 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 @@ -361,7 +365,9 @@ main(int argc, char *argv[], char *envp[]) InitCallbackManager(); InitVisualWrap(); InitOutput(&screenInfo, argc, argv); +#ifdef XPRINT PrinterInitOutput(&screenInfo, argc, argv); +#endif if (screenInfo.numScreens < 1) FatalError("no screens found"); diff --git a/dix/xpstubs.c b/dix/xpstubs.c index d04be0969..f7f37b64a 100644 --- a/dix/xpstubs.c +++ b/dix/xpstubs.c @@ -29,7 +29,9 @@ from The Open Group. #include "misc.h" #include "font.h" +#ifdef XPRINT #include "DiPrint.h" +#endif Bool XpClientIsBitmapClient( @@ -45,6 +47,7 @@ XpClientIsPrintClient( { return FALSE; } +#ifdef XPRINT int PrinterOptions( int argc, @@ -66,5 +69,5 @@ void PrinterUseMsg(void) void PrinterInitGlobals(void) { } - +#endif /* XPRINT */ diff --git a/mi/miinitext.c b/mi/miinitext.c index 26e48f608..8a8c1ed4e 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -84,6 +84,10 @@ SOFTWARE. #undef DAMAGE #undef XFIXES #undef XEVIE +#else +#ifndef LOADABLEPRINTDDX +#undef XPRINT +#endif /* LOADABLEPRINTDDX */ #endif /* PRINT_ONLY_SERVER */ diff --git a/os/utils.c b/os/utils.c index a8e1b49c6..5162ff11a 100644 --- a/os/utils.c +++ b/os/utils.c @@ -123,7 +123,9 @@ OR PERFORMANCE OF THIS SOFTWARE. #include "picture.h" #endif +#ifdef XPRINT #include "DiPrint.h" +#endif Bool noTestExtensions; #ifdef BEZIER @@ -655,7 +657,9 @@ void UseMsg(void) #ifdef XCSECURITY ErrorF("-sp file security policy file\n"); #endif +#ifdef XPRINT PrinterUseMsg(); +#endif ErrorF("-su disable any save under support\n"); ErrorF("-t # mouse threshold (pixels)\n"); ErrorF("-terminate terminate at server reset\n"); |