gwj / at91sam9263 · Commits

Commit 31a53c63b5283327db437ff053b3bfd54a6420a2

Authored by ths
1 parent cebdff77

Compile fix for Apple, by C.W. Betts. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4675 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
dyngen-exec.h
  View file @31a53c6
@@ -36,9 +36,9 @@ typedef unsigned char uint8_t; @@ -36,9 +36,9 @@ typedef unsigned char uint8_t;
36 typedef unsigned short uint16_t; 36 typedef unsigned short uint16_t;
37 typedef unsigned int uint32_t; 37 typedef unsigned int uint32_t;
38 // Linux/Sparc64 defines uint64_t 38 // Linux/Sparc64 defines uint64_t
39 -#if !(defined (__sparc_v9__) && defined(__linux__)) 39 +#if !(defined (__sparc_v9__) && defined(__linux__)) && !(defined(__APPLE__) && defined(__x86_64__))
40 /* XXX may be done for all 64 bits targets ? */ 40 /* XXX may be done for all 64 bits targets ? */
41 -#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__) 41 +#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__)
42 typedef unsigned long uint64_t; 42 typedef unsigned long uint64_t;
43 #else 43 #else
44 typedef unsigned long long uint64_t; 44 typedef unsigned long long uint64_t;
@@ -54,7 +54,7 @@ typedef signed char int8_t; @@ -54,7 +54,7 @@ typedef signed char int8_t;
54 typedef signed short int16_t; 54 typedef signed short int16_t;
55 typedef signed int int32_t; 55 typedef signed int int32_t;
56 // Linux/Sparc64 defines int64_t 56 // Linux/Sparc64 defines int64_t
57 -#if !(defined (__sparc_v9__) && defined(__linux__)) 57 +#if !(defined (__sparc_v9__) && defined(__linux__)) && !(defined(__APPLE__) && defined(__x86_64__))
58 #if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__) 58 #if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__)
59 typedef signed long int64_t; 59 typedef signed long int64_t;
60 #else 60 #else