gwj / at91sam9263 · Commits

Commit cebdff772d6af6a65bf799cbbf68f86d97025495

Authored by ths
1 parent 5452adbe

Fix always_inline definition for Darwin, by Andreas Faerber. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4674 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 5 additions and 1 deletions
host-utils.h
  View file @cebdff7
@@ -23,6 +23,8 @@ @@ -23,6 +23,8 @@
23 * THE SOFTWARE. 23 * THE SOFTWARE.
24 */ 24 */
25 25
  26 +#include "osdep.h"
  27 +
26 #if defined(__x86_64__) 28 #if defined(__x86_64__)
27 #define __HAVE_FAST_MULU64__ 29 #define __HAVE_FAST_MULU64__
28 static always_inline void mulu64 (uint64_t *plow, uint64_t *phigh, 30 static always_inline void mulu64 (uint64_t *plow, uint64_t *phigh,
@@ -35,9 +35,11 @@ @@ -35,9 +35,11 @@
35 #define always_inline inline 35 #define always_inline inline
36 #else 36 #else
37 #define always_inline __attribute__ (( always_inline )) __inline__ 37 #define always_inline __attribute__ (( always_inline )) __inline__
  38 +#define inline always_inline
38 #endif 39 #endif
39 -#endif 40 +#else
40 #define inline always_inline 41 #define inline always_inline
  42 +#endif
41 43
42 #ifdef __i386__ 44 #ifdef __i386__
43 #define REGPARM __attribute((regparm(3))) 45 #define REGPARM __attribute((regparm(3)))