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/quartzKeyboard.c | |
| parent | edd3fb784bad893550ee270e0a09f22f99783cf5 (diff) | |
XQuartz: Handled sanitization of namespace better
(cherry picked from commit 8cb23d672177da919257c885804cecd18cf9af88)
Diffstat (limited to 'hw/xquartz/quartzKeyboard.c')
| -rw-r--r-- | hw/xquartz/quartzKeyboard.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c index fd0c3ccb3..698f39a22 100644 --- a/hw/xquartz/quartzKeyboard.c +++ b/hw/xquartz/quartzKeyboard.c @@ -34,6 +34,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "sanitizedCarbon.h" + #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> #endif @@ -51,15 +53,6 @@ #include <sys/stat.h> #include "quartzCommon.h" - -#undef GetWindowAttributes -#undef ChangeWindowAttributes - -#include <CoreServices/CoreServices.h> -#include <Carbon/Carbon.h> -#include <IOKit/hidsystem/event_status_driver.h> -#include <IOKit/hidsystem/ev_keymap.h> -#include <architecture/byte_order.h> // For the NXSwap* #include "darwin.h" #include "quartzKeyboard.h" |