Something

Index: include/libkern/OSByteOrder.h===================================================================--- include/libkern/OSByteOrder.h	(revision 222)+++ include/libkern/OSByteOrder.h	(working copy)@@ -46,7 +46,7 @@                 (((uint64_t)(x) & 0x000000000000ff00ULL) << 40) | \                 (((uint64_t)(x) & 0x00000000000000ffULL) << 56))) -#if defined(__GNUC_UNUSED__)+#if defined(__GNUC__)  #if (defined(__ppc__) || defined(__ppc64__)) #include <libkern/ppc/OSByteOrder.h>@@ -70,9 +70,7 @@ #include <libkern/machine/OSByteOrder.h>  #define OSSwapInt16(x) OSSwapConstInt16(x)- #define OSSwapInt32(x) OSSwapConstInt32(x)- #define OSSwapInt64(x) OSSwapConstInt64(x)  #endif /* __GNUC_UNUSED__ */Index: include/libkern/i386/OSByteOrder.h===================================================================--- include/libkern/i386/OSByteOrder.h	(revision 222)+++ include/libkern/i386/OSByteOrder.h	(working copy)@@ -37,6 +37,9 @@  /* Generic byte swapping functions. */ +#ifndef _OS__OSBYTEORDERI386_H+#define _OS__OSBYTEORDERI386_H+ OS_INLINE uint16_t _OSSwapInt16(@@ -83,6 +86,8 @@ #error Unknown architecture #endif +#endif+ /* Functions for byte reversed loads. */  OS_INLINEIndex: otool/ofile_print.c===================================================================--- otool/ofile_print.c	(revision 222)+++ otool/ofile_print.c	(working copy)@@ -79,19 +79,12 @@ #define __vrsave vrsave #define __xer xer -#define __darwin_i386_exception_state i386_exception_state-#define __darwin_i386_float_state i386_float_state-#define __darwin_i386_thread_state i386_thread_state #define __busy busy #define __c0 c0 #define __c1 c1 #define __c2 c2 #define __c3 c3 #define __cs cs-#define __darwin_fp_control fp_control-#define __darwin_fp_status fp_status-#define __darwin_mmst_reg mmst_reg-#define __darwin_xmm_reg xmm_reg #define __denorm denorm #define __ds ds #define __eax eaxIndex: libstuff/ofile.c===================================================================--- libstuff/ofile.c	(revision 222)+++ libstuff/ofile.c	(working copy)@@ -20,9 +20,6 @@  *   * @APPLE_LICENSE_HEADER_END@  */-#define __darwin_i386_exception_state i386_exception_state-#define __darwin_i386_float_state i386_float_state-#define __darwin_i386_thread_state i386_thread_state  #ifndef RLD #ifdef SHLIB@@ -41,7 +38,15 @@ #include <mach-o/fat.h> #include <mach-o/loader.h> #include <mach/m68k/thread_status.h>+#undef MACHINE_THREAD_STATE	/* need to undef these to avoid warnings */+#undef MACHINE_THREAD_STATE_COUNT+#undef THREAD_STATE_NONE+#undef VALID_THREAD_STATE_FLAVOR #include <mach/ppc/thread_status.h>+#undef MACHINE_THREAD_STATE	/* need to undef these to avoid warnings */+#undef MACHINE_THREAD_STATE_COUNT+#undef THREAD_STATE_NONE+#undef VALID_THREAD_STATE_FLAVOR #include <mach/m88k/thread_status.h> #include <mach/i860/thread_status.h> #include <mach/i386/thread_status.h>