summaryrefslogtreecommitdiff
path: root/hw/darwin/darwinKeyboard.c
diff options
context:
space:
mode:
Diffstat (limited to 'hw/darwin/darwinKeyboard.c')
-rw-r--r--hw/darwin/darwinKeyboard.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/hw/darwin/darwinKeyboard.c b/hw/darwin/darwinKeyboard.c
index b51e2da5b..7f7b7c74a 100644
--- a/hw/darwin/darwinKeyboard.c
+++ b/hw/darwin/darwinKeyboard.c
@@ -56,9 +56,13 @@
===========================================================================
*/
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
// Define this to get a diagnostic output to stderr which is helpful
// in determining how the X server is interpreting the Darwin keymap.
-#define DUMP_DARWIN_KEYMAP
+// #define DUMP_DARWIN_KEYMAP
#include <stdio.h>
#include <stdlib.h>
@@ -69,7 +73,15 @@
#include <architecture/byte_order.h> // For the NXSwap*
#include "darwin.h"
#include "darwinKeyboard.h"
+
+#ifdef NDEBUG
+#undef NDEBUG
#include <assert.h>
+#define NDEBUG 1
+#else
+#include <assert.h>
+#endif
+
#define AltMask Mod1Mask
#define MetaMask Mod2Mask
#define FunctionMask Mod3Mask