[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freedesktop-xlibs-commit
Subject:    X11/include/X11 Xutil.h,3.11,3.12 region.h,1.5,1.6
From:       Owen Taylor <xlibs-commit () pdx ! freedesktop ! org>
Date:       2005-02-08 20:23:47
Message-ID: 20050208202347.3C7569E914 () gabe ! freedesktop ! org
[Download RAW message or body]

Committed by: otaylor

Update of /cvs/xlibs/X11/include/X11
In directory gabe:/tmp/cvs-serv7887/include/X11

Modified Files:
	Xutil.h region.h 
Log Message:
2005-02-08  Owen Taylor  <otaylor@redhat.com>

        * include/X11/region.h include/X11/Xuti.h: Move
        the Region typedef back where it belong, don't include
        region.h from Xutil.h ... it defines all sorts of
        stuff (TRUE/FALSE/MIN/MAXSHORT/Box...) that will
        break compilation of projects using Xutil.h. (#2501)


Index: Xutil.h
===================================================================
RCS file: /cvs/xlibs/X11/include/X11/Xutil.h,v
retrieving revision 3.11
retrieving revision 3.12
diff -u -d -r3.11 -r3.12
--- Xutil.h	28 Jan 2005 22:52:21 -0000	3.11
+++ Xutil.h	8 Feb 2005 20:23:42 -0000	3.12
@@ -53,7 +53,6 @@
 
 /* You must include <X11/Xlib.h> before including this file */
 #include <X11/Xlib.h>
-#include <X11/region.h>
 
 /* 
  * Bitmask returned by XParseGeometry().  Each bit tells if the corresponding

Index: region.h
===================================================================
RCS file: /cvs/xlibs/X11/include/X11/region.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- region.h	28 Jan 2005 22:52:21 -0000	1.5
+++ region.h	8 Feb 2005 20:23:42 -0000	1.6
@@ -80,7 +80,9 @@
     BOX extents;
 } REGION;
 
-typedef struct _XRegion *Region; 
+/* Xutil.h contains the declaration: 
+ * typedef struct _XRegion *Region; 
+ */   
 
 /*  1 if two BOXs overlap.
  *  0 if two BOXs do not overlap.


[prev in list] [next in list] [prev in thread] [next in thread]