diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-06-19 17:20:52 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-06-19 17:20:52 +0930 |
| commit | 1f97a7647606226cde61d6ad7a94f2b0b571a06c (patch) | |
| tree | 63959752648b4f3bcfe4ac271d0a714dfcd93280 /include/misc.h | |
| parent | 5dee64fc99f34e091abce65d47c4b6f026ab4849 (diff) | |
| parent | 2e7fef7d0837939e822c40b6ac77e7f0e66d57bd (diff) | |
Merge branch 'master' into mpx
Conflicts:
dix/devices.c
hw/xfree86/common/xf86Xinput.c
hw/xfree86/loader/xf86sym.c
mi/mieq.c
Diffstat (limited to 'include/misc.h')
| -rw-r--r-- | include/misc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/misc.h b/include/misc.h index 05c3dff45..14c848d1c 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; |