diff options
| -rw-r--r-- | include/misc.h | 2 | ||||
| -rw-r--r-- | include/miscstruct.h | 5 | ||||
| -rw-r--r-- | include/regionstr.h | 13 |
3 files changed, 5 insertions, 15 deletions
diff --git a/include/misc.h b/include/misc.h index 2be1d66a6..e6a5e9eb2 100644 --- a/include/misc.h +++ b/include/misc.h @@ -239,7 +239,7 @@ extern int Ones( unsigned long /*mask*/); typedef struct _xPoint *DDXPointPtr; -typedef struct _Box *BoxPtr; +typedef struct pixman_box16 *BoxPtr; typedef struct _xEvent *xEventPtr; typedef struct _xRectangle *xRectanglePtr; typedef struct _GrabRec *GrabPtr; diff --git a/include/miscstruct.h b/include/miscstruct.h index c39f03ce8..4f5b1d516 100644 --- a/include/miscstruct.h +++ b/include/miscstruct.h @@ -51,12 +51,11 @@ SOFTWARE. #include "misc.h" #include <X11/Xprotostr.h> #include "gc.h" +#include <pixman/pixman.h> typedef xPoint DDXPointRec; -typedef struct _Box { - short x1, y1, x2, y2; -} BoxRec; +typedef struct pixman_box16 BoxRec; typedef union _DevUnion { pointer ptr; diff --git a/include/regionstr.h b/include/regionstr.h index e6882e77a..8d47c028e 100644 --- a/include/regionstr.h +++ b/include/regionstr.h @@ -48,7 +48,7 @@ SOFTWARE. #ifndef REGIONSTRUCT_H #define REGIONSTRUCT_H -typedef struct _Region RegionRec, *RegionPtr; +typedef struct pixman_region16 RegionRec, *RegionPtr; #include "miscstruct.h" @@ -64,16 +64,7 @@ typedef struct _Region RegionRec, *RegionPtr; * clip region */ -typedef struct _RegData { - long size; - long numRects; -/* BoxRec rects[size]; in memory but not explicitly declared */ -} RegDataRec, *RegDataPtr; - -struct _Region { - BoxRec extents; - RegDataPtr data; -}; +typedef struct pixman_region16_data RegDataRec, *RegDataPtr; extern BoxRec miEmptyBox; extern RegDataRec miEmptyData; |