diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-20 10:20:14 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-20 10:20:14 +0930 |
| commit | 99d28c3ef37aeffe7d8ec41e45a650ba248c6958 (patch) | |
| tree | f64efb86b1bc5f0c864d6a4ad0d79291f96b1c15 /os/utils.c | |
| parent | fc7e2566cc076c0d979f74871bc436df43401058 (diff) | |
| parent | 0178b6a4abed0df3e90ba393709ed566105e7c2c (diff) | |
Merge branch 'master' into mpx
Conflicts:
Xext/xprint.c (removed in master)
config/hal.c
dix/main.c
hw/kdrive/ati/ati_cursor.c (removed in master)
hw/kdrive/i810/i810_cursor.c (removed in master)
hw/xprint/ddxInit.c (removed in master)
xkb/ddxLoad.c
Diffstat (limited to 'os/utils.c')
| -rw-r--r-- | os/utils.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/os/utils.c b/os/utils.c index 4bebeca9e..90342c64a 100644 --- a/os/utils.c +++ b/os/utils.c @@ -128,10 +128,6 @@ OR PERFORMANCE OF THIS SOFTWARE. #include "picture.h" #endif -#ifdef XPRINT -#include "DiPrint.h" -#endif - _X_EXPORT Bool noTestExtensions; #ifdef BIGREQS _X_EXPORT Bool noBigReqExtension = FALSE; @@ -613,9 +609,6 @@ void UseMsg(void) ErrorF("-render [default|mono|gray|color] set render color alloc policy\n"); #endif ErrorF("-s # screen-saver timeout (minutes)\n"); -#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"); @@ -1027,12 +1020,6 @@ ProcessCommandLine(int argc, char *argv[]) i = skip - 1; } #endif -#ifdef XPRINT - else if ((skip = PrinterOptions(argc, argv, i)) != i) - { - i = skip - 1; - } -#endif #ifdef AIXV3 else if ( strcmp( argv[i], "-timeout") == 0) { |