Index: xc/ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.896
diff -u -2 -0 -r1.896 ChangeLog
--- xc/ChangeLog	23 Apr 2005 20:23:43 -0000	1.896
+++ xc/ChangeLog	23 Apr 2005 22:51:38 -0000
@@ -1,21 +1,30 @@
 2005-04-23 Roland Mainz <roland.mainz@nrubsig.org>
+	* xc/programs/Xserver/dix/main.c
+	bugzilla #3118 (https://bugs.freedesktop.org/show_bug.cgi?id=3118)
+	attachment #xxx (https://bugs.freedesktop.org/attachment.cgi?id=xxx)
+	Get Xprint server working again which was broken by the
+	05/04/20 05:49:46 commit commit (the CPP symbol |XPRINT| is not
+	universally available when building the Xserver and should be used
+	with care).
+
+2005-04-23 Roland Mainz <roland.mainz@nrubsig.org>
 	* xc/config/cf/linux.cf
 	* xc/config/cf/sun.cf
 	bugzilla #3023 (https://bugs.freedesktop.org/show_bug.cgi?id=3023)
 	attachment #2523 (https://bugs.freedesktop.org/attachment.cgi?id=2523)
 	Make the Xserver and libraries (X11, Xt, Xaw etc.) and client
 	applications largefile-aware by default on Linux and Solaris (*BSD
 	platforms and IRIX are aready largefile-aware by default, only the
 	status of AIX+HP/UX is currently unknown). The change does not
 	affect Xserver modules loaded via the ELF loader which would either
 	require an ABI change or a port of the whole lf64(5) API (both steps
 	may not be required as the ELF loader may go away in favour of the DL
 	loader where the libc wrapper is no longer needed to access files).
 
 2005-04-23  Adam Jackson  <ajax@freedesktop.org>
 
 	* config/cf/X11.tmpl:
 	Bug #2606: Force the Security extension to be built if the Appgroup
 	extension is requested.
 
 2005-04-23  Adam Jackson  <ajax@freedesktop.org>
Index: xc/programs/Xserver/dix/main.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/dix/main.c,v
retrieving revision 1.8
diff -u -2 -0 -r1.8 main.c
--- xc/programs/Xserver/dix/main.c	20 Apr 2005 12:49:46 -0000	1.8
+++ xc/programs/Xserver/dix/main.c	23 Apr 2005 22:51:46 -0000
@@ -83,43 +83,41 @@
 #include <X11/X.h>
 #include <X11/Xos.h>   /* for unistd.h  */
 #include <X11/Xproto.h>
 #include "scrnintstr.h"
 #include "misc.h"
 #include "os.h"
 #include "windowstr.h"
 #include "resource.h"
 #include "dixstruct.h"
 #include "gcstruct.h"
 #include "extension.h"
 #include "colormap.h"
 #include "colormapst.h"
 #include "cursorstr.h"
 #include "font.h"
 #include "opaque.h"
 #include "servermd.h"
 #include "site.h"
 #include "dixfont.h"
 #include "extnsionst.h"
-#ifdef XPRINT
 #include "DiPrint.h"
-#endif
 #ifdef PANORAMIX
 #include "panoramiXsrv.h"
 #else
 #include "dixevents.h"		/* InitEvents() */
 #include "dispatch.h"		/* InitProcVectors() */
 #endif
 
 #ifdef DPMSExtension
 #define DPMS_SERVER
 #include <X11/extensions/dpms.h>
 #include "dpmsproc.h"
 #endif
 
 extern int InitClientPrivates(ClientPtr client);
 
 extern void Dispatch(void);
 
 char *ConnectionInfo;
 xConnSetupPrefix connSetupPrefix;
 
@@ -234,43 +232,41 @@
 	~0, ~0, ~0, ~0,
 	~0, ~0, ~0, ~0,
 	~0, ~0, ~0, ~0,
 	 3		/* 64 bits per scanline pad unit */
 };
 
 #ifndef MIN
 #define MIN(a,b) (((a) < (b)) ? (a) : (b))
 #endif
 
 int
 main(int argc, char *argv[], char *envp[])
 {
     int		i, j, k, error;
     char	*xauthfile;
     HWEventQueueType	alwaysCheckForInput[2];
 
     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
      * from another thread. */
 #if defined(__DARWIN__) && defined(DARWIN_WITH_QUARTZ)
     DarwinHandleGUI(argc, argv, envp);
 #endif
 
     /* Notice if we're restarted.  Probably this is because we jumped through
      * an uninitialized pointer */
     if (restart)
 	FatalError("server restarted. Jumped through uninitialized pointer?\n");
     else
 	restart = 1;
 
     CheckUserParameters(argc, argv, envp);
 
     CheckUserAuthorization();
 
 #ifdef COMMANDLINE_CHALLENGED_OPERATING_SYSTEMS
@@ -348,43 +344,41 @@
 	PixmapWidthPaddingInfo[1].padPixelsLog2 = answer[j][k];
  	j = indexForBitsPerPixel[8]; /* bits per byte */
  	PixmapWidthPaddingInfo[1].padBytesLog2 = answer[j][k];
 	PixmapWidthPaddingInfo[1].bitsPerPixel = 1;
 
 	InitAtoms();
 	InitEvents();
 	InitGlyphCaching();
 	ResetClientPrivates();
 	ResetScreenPrivates();
 	ResetWindowPrivates();
 	ResetGCPrivates();
 #ifdef PIXPRIV
 	ResetPixmapPrivates();
 #endif
 	ResetColormapPrivates();
 	ResetFontPrivateIndex();
 	InitCallbackManager();
 	InitVisualWrap();
 	InitOutput(&screenInfo, argc, argv);
-#ifdef XPRINT
 	PrinterInitOutput(&screenInfo, argc, argv);
-#endif
 
 	if (screenInfo.numScreens < 1)
 	    FatalError("no screens found");
 	if (screenInfo.numVideoScreens < 0)
 	    screenInfo.numVideoScreens = screenInfo.numScreens;
 	InitExtensions(argc, argv);
 	if (!InitClientPrivates(serverClient))
 	    FatalError("failed to allocate serverClient devprivates");
 	for (i = 0; i < screenInfo.numScreens; i++)
 	{
 	    ScreenPtr pScreen = screenInfo.screens[i];
 	    if (!CreateScratchPixmapsForScreen(i))
 		FatalError("failed to create scratch pixmaps");
 	    if (pScreen->CreateScreenResources &&
 		!(*pScreen->CreateScreenResources)(pScreen))
 		FatalError("failed to create screen resources");
 	    if (!CreateGCperDepth(i))
 		FatalError("failed to create scratch GCs");
 	    if (!CreateDefaultStipple(i))
 		FatalError("failed to create default stipple");