diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-05-22 14:50:26 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil> | 2007-05-22 14:50:26 -0400 |
| commit | 2a4aa63a23ddd816b647b851a01865861827a7eb (patch) | |
| tree | a957a7979bda27a4a2c103835cfd6e3a7ddc79e5 /include/miscstruct.h | |
| parent | 9cee4ec5e6e06d23aafb302494b082c77ade4623 (diff) | |
| parent | cc648e609d472472bac4a2e568eb3598b3690ba3 (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
include/miscstruct.h
Diffstat (limited to 'include/miscstruct.h')
| -rw-r--r-- | include/miscstruct.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/miscstruct.h b/include/miscstruct.h index f78458771..81f699ad1 100644 --- a/include/miscstruct.h +++ b/include/miscstruct.h @@ -50,12 +50,11 @@ SOFTWARE. #include "misc.h" #include <X11/Xprotostr.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; |