diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-04-05 20:58:58 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-04-05 20:58:58 +0200 |
| commit | bb23f7a3d8e1ebdcf59d12d2e51bcaca849818b4 (patch) | |
| tree | 50f18d3c2e4f192322c106bb73fa07869d949091 /nx-X11/programs/Xserver/dix/main.c | |
| parent | 8ed8a43d2cad421561d0082949d2bfa9f29c7675 (diff) | |
| parent | d280fa15e571f568125786c216f168bcbfc1d15a (diff) | |
| download | nx-libs-bb23f7a3d8e1ebdcf59d12d2e51bcaca849818b4.tar.gz nx-libs-bb23f7a3d8e1ebdcf59d12d2e51bcaca849818b4.tar.bz2 nx-libs-bb23f7a3d8e1ebdcf59d12d2e51bcaca849818b4.zip | |
Merge branch 'feature/other-Xserver-cleanup' into arctica-3.6.x
Attributes GH PR #8: https://github.com/ArcticaProject/nx-libs/pull/8
Diffstat (limited to 'nx-X11/programs/Xserver/dix/main.c')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/main.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/dix/main.c b/nx-X11/programs/Xserver/dix/main.c index 6a8f79a96..270de6ced 100644 --- a/nx-X11/programs/Xserver/dix/main.c +++ b/nx-X11/programs/Xserver/dix/main.c @@ -104,9 +104,6 @@ Equipment Corporation. #include "site.h" #include "dixfont.h" #include "extnsionst.h" -#ifdef XPRINT -#include "DiPrint.h" -#endif #ifdef PANORAMIX #include "panoramiXsrv.h" #else @@ -255,9 +252,6 @@ 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 @@ -370,9 +364,6 @@ 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"); |