diff options
| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-04-18 20:06:17 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-04-18 20:07:55 -0700 |
| commit | 5183fea6d38de4bcf657e9c2a983dfd81a2a223f (patch) | |
| tree | f8f701aa2da17b5cf8be9f1e7f629561929fdf24 /hw/xquartz/X11Controller.m | |
| parent | edd3fb784bad893550ee270e0a09f22f99783cf5 (diff) | |
XQuartz: Handled sanitization of namespace better
(cherry picked from commit 8cb23d672177da919257c885804cecd18cf9af88)
Diffstat (limited to 'hw/xquartz/X11Controller.m')
| -rw-r--r-- | hw/xquartz/X11Controller.m | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m index 2fd988661..1f23569e6 100644 --- a/hw/xquartz/X11Controller.m +++ b/hw/xquartz/X11Controller.m @@ -27,6 +27,8 @@ promote the sale, use or other dealings in this Software without prior written authorization. */ +#include "sanitizedCarbon.h" + #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> #endif @@ -37,17 +39,13 @@ #import "X11Controller.h" #import "X11Application.h" -#import <Carbon/Carbon.h> -/* ouch! */ -#define BOOL X_BOOL #include "opaque.h" -# include "darwin.h" -# include "quartz.h" -# define _APPLEWM_SERVER_ -# include "X11/extensions/applewm.h" -# include "applewmExt.h" -#undef BOOL +#include "darwin.h" +#include "quartz.h" +#define _APPLEWM_SERVER_ +#include "X11/extensions/applewm.h" +#include "applewmExt.h" #include <stdio.h> #include <unistd.h> |