summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorrey Lyons <torrey@mrcla.com>2005-05-06 00:45:30 +0000
committerTorrey Lyons <torrey@mrcla.com>2005-05-06 00:45:30 +0000
commit78e4cb67d0f595f4fba5e98a9fa46de044556905 (patch)
treeb218fccf9e9467cbdd9e11d609a6703cf441e1ba
parentd5739efd2c266081ed6b844767dcdd0a3331bfd3 (diff)
Fix build issues on Mac OS X 10.4.0.XORG-6_8_99_6
-rw-r--r--hw/darwin/darwinKeyboard.c4
-rw-r--r--hw/darwin/quartz/xpr/x-hash.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/darwin/darwinKeyboard.c b/hw/darwin/darwinKeyboard.c
index 234a70783..dbc449dc3 100644
--- a/hw/darwin/darwinKeyboard.c
+++ b/hw/darwin/darwinKeyboard.c
@@ -64,12 +64,12 @@
/* Define this to use Alt for Mode_switch. */
#define ALT_IS_MODE_SWITCH 1
-#include <drivers/event_status_driver.h>
-#include <IOKit/hidsystem/ev_keymap.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <sys/stat.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 "darwinKeyboard.h"
diff --git a/hw/darwin/quartz/xpr/x-hash.c b/hw/darwin/quartz/xpr/x-hash.c
index 51fbb2877..feffb1b9e 100644
--- a/hw/darwin/quartz/xpr/x-hash.c
+++ b/hw/darwin/quartz/xpr/x-hash.c
@@ -223,7 +223,7 @@ hash_table_modify (x_hash_table *h, void *k, void *v, int replace)
{
hash_table_destroy_item (h, ITEM_KEY (item),
ITEM_VALUE (item));
- ITEM_KEY (item) = k;
+ item->next = k;
ITEM_VALUE (item) = v;
}
else