Index: xc/ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.902
diff -u -2 -0 -r1.902 ChangeLog
--- xc/ChangeLog	25 Apr 2005 13:41:20 -0000	1.902
+++ xc/ChangeLog	26 Apr 2005 05:28:41 -0000
@@ -1,20 +1,27 @@
+2005-04-26 Roland Mainz <roland.mainz@nrubsig.org>
+	* xc/programs/xdpyinfo/xdpyinfo.c
+	bugzilla #2705 (https://bugs.freedesktop.org/show_bug.cgi?id=2705)
+	attachment #xxx (https://bugs.freedesktop.org/attachment.cgi?id=xxx)
+	bug xxx part II: Fix build to work with |#define BuildXprint NO|
+	Patch by Kevin E. Martin <kem@freedesktop-dot-org>
+
 2005-04-25  Alexander Gottwald  <ago at freedesktop dot org>
 
 	* config/xf/X11.tmpl:
 	Bug #3069: Reenable DefaultFontPath and DefaultFSFontPath which got 
 	removed in the BuildLowMem commit
 
 2005-04-23  Adam Jackson  <ajax@freedesktop.org>
 
 	* programs/Xserver/hw/xfree86/loader/loadmod.c:
 	Bug #2138: When the server is built with MakeDllModules YES, prefer
 	dlloader modules to elfloader modules, and vice versa when
 	MakeDllModules is NO.  Based on 028_loader_speed_hack.diff from
 	Ubuntu (Daniel Stone).
 
 2005-04-23  Adam Jackson  <ajax@freedesktop.org>
 
 	* programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c:
 	Bug #2141: Rework misleading warning message when APM support is
 	unavailable. (Previous patch on 2005-04-14 changed the wrong message.)
 
Index: xc/programs/xdpyinfo/xdpyinfo.c
===================================================================
RCS file: /cvs/xorg/xc/programs/xdpyinfo/xdpyinfo.c,v
retrieving revision 1.8
diff -u -2 -0 -r1.8 xdpyinfo.c
--- xc/programs/xdpyinfo/xdpyinfo.c	11 Mar 2005 21:18:12 -0000	1.8
+++ xc/programs/xdpyinfo/xdpyinfo.c	26 Apr 2005 05:28:51 -0000
@@ -342,63 +342,65 @@
 	    vip->red_mask, vip->green_mask, vip->blue_mask);
     printf ("    significant bits in color specification:    %d bits\n",
 	    vip->bits_per_rgb);
 }
 
 /* xc/programs/twm/twm.c has a copy of |hasExtension()|, please
  * keep both versions in sync... */
 static
 Bool hasExtension(Display *dpy, char *extname)
 {
   int    num_extensions,
          i;
   char **extensions;
   extensions = XListExtensions(dpy, &num_extensions);
   for (i = 0; i < num_extensions &&
          (strcmp(extensions[i], extname) != 0); i++);
   XFreeExtensionList(extensions);
   return i != num_extensions;
 }
 
+#ifdef INCLUDE_XPRINT_SUPPORT
 /* xc/programs/twm/twm.c has a copy of |IsPrintScreen()|, please
  * keep both versions in sync... */
 static
 Bool IsPrintScreen(Screen *s)
 {
     Display *dpy = XDisplayOfScreen(s);
     int      i;
 
     /* Check whether this is a screen of a print DDX */
     if (hasExtension(dpy, XP_PRINTNAME)) {
         Screen **pscreens;
         int      pscrcount;
 
         pscreens = XpQueryScreens(dpy, &pscrcount);
         for( i = 0 ; (i < pscrcount) && pscreens ; i++ ) {
             if (s == pscreens[i]) {
                 return True;
             }
         }
         XFree(pscreens);                      
     }
     return False;
 }
+#endif /* INCLUDE_XPRINT_SUPPORT */
 
 static void
 print_screen_info(Display *dpy, int scr)
 {
     Screen *s = ScreenOfDisplay (dpy, scr);  /* opaque structure */
     XVisualInfo viproto;		/* fill in for getting info */
     XVisualInfo *vip;			/* retured info */
     int nvi;				/* number of elements returned */
     int i;				/* temp variable: iterator */
     char eventbuf[80];			/* want 79 chars per line + nul */
     static char *yes = "YES", *no = "NO", *when = "WHEN MAPPED";
     double xres, yres;
     int ndepths = 0, *depths = NULL;
     unsigned int width, height;
     Bool isPrintScreen = False; /* Initalise this if |INCLUDE_XPRINT_SUPPORT| is not set */
 
     /*
      * there are 2.54 centimeters to an inch; so there are 25.4 millimeters.
      *
      *     dpi = N pixels / (M millimeters / (25.4 millimeters / 1 inch))