From c227f0995e1722a1abccc28cadf0664266bd8043 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Thu, 1 Oct 2009 16:12:16 -0500 Subject: Revert "Get rid of _t suffix" In the very least, a change like this requires discussion on the list. The naming convention is goofy and it causes a massive merge problem. Something like this _must_ be presented on the list first so people can provide input and cope with it. This reverts commit 99a0949b720a0936da2052cb9a46db04ffc6db29. Signed-off-by: Anthony Liguori --- darwin-user/commpage.c | 2 +- darwin-user/machload.c | 2 +- darwin-user/qemu.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'darwin-user') diff --git a/darwin-user/commpage.c b/darwin-user/commpage.c index 641fdb390a..2b41bc5e3a 100644 --- a/darwin-user/commpage.c +++ b/darwin-user/commpage.c @@ -109,7 +109,7 @@ static struct commpage_entry commpage_entries[] = COMMPAGE_ENTRY(add_atomic_word64, 0, 0x1c0, unimpl_commpage, CALL_INDIRECT | HAS_PTR), COMMPAGE_ENTRY(mach_absolute_time, 0, 0x200, unimpl_commpage, CALL_INDIRECT), - COMMPAGE_ENTRY(a_spinlockry, 1, 0x220, unimpl_commpage, CALL_INDIRECT), + COMMPAGE_ENTRY(spinlock_try, 1, 0x220, unimpl_commpage, CALL_INDIRECT), COMMPAGE_ENTRY(spinlock_lock, 1, 0x260, OSSpinLockLock, CALL_DIRECT), COMMPAGE_ENTRY(spinlock_unlock, 1, 0x2a0, OSSpinLockUnlock, CALL_DIRECT), COMMPAGE_ENTRY(pthread_getspecific, 0, 0x2c0, unimpl_commpage, CALL_INDIRECT), diff --git a/darwin-user/machload.c b/darwin-user/machload.c index 027976b456..4bb5c7276a 100644 --- a/darwin-user/machload.c +++ b/darwin-user/machload.c @@ -101,7 +101,7 @@ typedef struct mach_i386_thread_state { unsigned int es; unsigned int fs; unsigned int gs; -}; +} mach_i386_thread_state_t; void bswap_i386_thread_state(struct mach_i386_thread_state *ts) { diff --git a/darwin-user/qemu.h b/darwin-user/qemu.h index 4084819d9b..462bbdac22 100644 --- a/darwin-user/qemu.h +++ b/darwin-user/qemu.h @@ -10,7 +10,7 @@ #include "gdbstub.h" -typedef siginfo_t a_target_siginfo; +typedef siginfo_t target_siginfo_t; #define target_sigaction sigaction #ifdef TARGET_I386 struct target_pt_regs { -- cgit v1.2.3