merge latest (4.3.99.16) from XFree86 (vendor) branch

2003-11-26 22:49:07 +00:00
parent c57959ad6a
commit 0097b6fe2d
796 changed files with 58012 additions and 26524 deletions
--- a/include/pixmapstr.h
+++ b/include/pixmapstr.h
@@ -45,12 +45,13 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.

 ******************************************************************/
+/* $XFree86: xc/programs/Xserver/include/pixmapstr.h,v 1.3 2003/07/16 01:38:52 dawes Exp $ */

 #ifndef PIXMAPSTRUCT_H
 #define PIXMAPSTRUCT_H
 #include "pixmap.h"
 #include "screenint.h"
-#include "miscstruct.h"
+#include "regionstr.h"

 typedef struct _Drawable {
    unsigned char	type;	/* DRAWABLE_<type> */