aboutsummaryrefslogtreecommitdiff
path: root/dyngen-exec.h
diff options
context:
space:
mode:
authorths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2008-06-05 23:06:46 +0000
committerths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2008-06-05 23:06:46 +0000
commit31a53c63b5283327db437ff053b3bfd54a6420a2 (patch)
tree07d9b8d21f9a792db59847275d6d32b7c8eb3d7f /dyngen-exec.h
parentcebdff772d6af6a65bf799cbbf68f86d97025495 (diff)
downloadqemu-31a53c63b5283327db437ff053b3bfd54a6420a2.zip
qemu-31a53c63b5283327db437ff053b3bfd54a6420a2.tar.gz
qemu-31a53c63b5283327db437ff053b3bfd54a6420a2.tar.bz2
Compile fix for Apple, by C.W. Betts.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4675 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'dyngen-exec.h')
-rw-r--r--dyngen-exec.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/dyngen-exec.h b/dyngen-exec.h
index f51d363..92c1ae8 100644
--- a/dyngen-exec.h
+++ b/dyngen-exec.h
@@ -36,9 +36,9 @@ typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
typedef unsigned int uint32_t;
// Linux/Sparc64 defines uint64_t
-#if !(defined (__sparc_v9__) && defined(__linux__))
+#if !(defined (__sparc_v9__) && defined(__linux__)) && !(defined(__APPLE__) && defined(__x86_64__))
/* XXX may be done for all 64 bits targets ? */
-#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__)
+#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__)
typedef unsigned long uint64_t;
#else
typedef unsigned long long uint64_t;
@@ -54,7 +54,7 @@ typedef signed char int8_t;
typedef signed short int16_t;
typedef signed int int32_t;
// Linux/Sparc64 defines int64_t
-#if !(defined (__sparc_v9__) && defined(__linux__))
+#if !(defined (__sparc_v9__) && defined(__linux__)) && !(defined(__APPLE__) && defined(__x86_64__))
#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__)
typedef signed long int64_t;
#else