[xserver-commit] xserver/include regionstr.h,1.10,1.11 extnsionst.h,3.10,3.11

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xserver/include
In directory pdx:/tmp/cvs-serv9886/include

Modified Files:
	regionstr.h extnsionst.h 
Log Message:
configure.ac: I'm trying to unbreak the build; whether I manage to do so or not
              this time is anyone's guess.
include/{regionstr,extnsionst}.h: Drag in a couple of minor changes from XFree86
                                  (add some macros and structs).


Index: regionstr.h
===================================================================
RCS file: /cvs/xserver/xserver/include/regionstr.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- a/regionstr.h	11 Sep 2003 05:12:51 -0000	1.10
+++ b/regionstr.h	9 Mar 2004 12:41:18 -0000	1.11
@@ -288,6 +288,13 @@
     (_pReg)->data = &miEmptyData; \
 }
 
+#define REGION_NULL(_pScreen, _pReg) \
+{ \
+    REGION_UNINIT(_pScreen, _pReg); \
+    (_pReg)->extents = miEmptyBox; \
+    (_pReg)->data = &miEmptyData; \
+}
+
 #define REGION_EXTENTS(_pScreen, _pReg) \
     &(_pReg)->extents
 
@@ -295,6 +302,11 @@
 
 #endif /* NEED_SCREEN_REGIONS */
 
+#ifndef REGION_NULL
+#define REGION_NULL(_pScreen, _pReg) \
+    REGION_INIT(_pScreen, _pReg, NullBox, 1)
+#endif
+
 /* moved from mi.h */
 
 extern RegionPtr miRegionCreate(

Index: extnsionst.h
===================================================================
RCS file: /cvs/xserver/xserver/include/extnsionst.h,v
retrieving revision 3.10
retrieving revision 3.11
diff -u -d -r3.10 -r3.11
--- a/extnsionst.h	2 Nov 2003 19:56:10 -0000	3.10
+++ b/extnsionst.h	9 Mar 2004 12:41:18 -0000	3.11
@@ -88,6 +88,11 @@
 	xEvent *,
 	xEvent *);
 
+#define SetGCVector(pGC, VectorElement, NewRoutineAddress, Atom) \
+    pGC->VectorElement = NewRoutineAddress;
+
+#define GetGCValue(pGC, GCElement) (pGC->GCElement)
+
 extern ExtensionEntry *AddExtension(
     char* /*name*/,
     int /*NumEvents*/,