mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-29 21:46:40 +00:00
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>.
This commit is contained in:
parent
ac18f8e308
commit
26aec10ada
6 changed files with 53 additions and 29 deletions
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.10 2004/11/15 15:06:50 ago Exp $ */
|
||||
/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.11 2004/11/25 12:48:21 ago Exp $ */
|
||||
/* $Xorg: utils.c,v 1.5 2001/02/09 02:05:24 xorgcvs Exp $ */
|
||||
/*
|
||||
|
||||
|
|
@ -123,6 +123,8 @@ OR PERFORMANCE OF THIS SOFTWARE.
|
|||
#include "picture.h"
|
||||
#endif
|
||||
|
||||
#include "DiPrint.h"
|
||||
|
||||
Bool noTestExtensions;
|
||||
#ifdef BEZIER
|
||||
Bool noBezierExtension = FALSE;
|
||||
|
|
@ -653,6 +655,7 @@ void UseMsg(void)
|
|||
#ifdef XCSECURITY
|
||||
ErrorF("-sp file security policy file\n");
|
||||
#endif
|
||||
PrinterUseMsg();
|
||||
ErrorF("-su disable any save under support\n");
|
||||
ErrorF("-t # mouse threshold (pixels)\n");
|
||||
ErrorF("-terminate terminate at server reset\n");
|
||||
|
|
@ -1059,7 +1062,7 @@ ProcessCommandLine(int argc, char *argv[])
|
|||
}
|
||||
#endif
|
||||
#ifdef XPRINT
|
||||
else if ((skip = XprintOptions(argc, argv, i)) != i)
|
||||
else if ((skip = PrinterOptions(argc, argv, i)) != i)
|
||||
{
|
||||
i = skip - 1;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue