diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-24 05:24:58 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-24 05:24:58 +0400 |
| commit | 3c11379e26b1aad399ecd0afc4d23df12b24f3cd (patch) | |
| tree | 0a549fceeaf261e9ca0900711e99f35f6b2b0c24 /source/blender/blenlib/BLI_math_inline.h | |
| parent | 0c898514f0b1536e1b335f24a1408f70c0162c48 (diff) | |
code cleanup: move bmesh inline funcs to headers (avoids compiling the C files).
Diffstat (limited to 'source/blender/blenlib/BLI_math_inline.h')
| -rw-r--r-- | source/blender/blenlib/BLI_math_inline.h | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/source/blender/blenlib/BLI_math_inline.h b/source/blender/blenlib/BLI_math_inline.h index fcc5fb744bb..ce43d5fb941 100644 --- a/source/blender/blenlib/BLI_math_inline.h +++ b/source/blender/blenlib/BLI_math_inline.h @@ -38,21 +38,21 @@ extern "C" { #define __BLI_MATH_INLINE_H__ #ifdef __BLI_MATH_INLINE_H__ -#ifdef _MSC_VER -#define MINLINE static __forceinline -#define MALWAYS_INLINE MINLINE +# ifdef _MSC_VER +# define MINLINE static __forceinline +# define MALWAYS_INLINE MINLINE +# else +# define MINLINE static inline +# if (defined(__APPLE__) && defined(__ppc__)) + /* static inline __attribute__ here breaks osx ppc gcc42 build */ +# define MALWAYS_INLINE static __attribute__((always_inline)) +# else +# define MALWAYS_INLINE static inline __attribute__((always_inline)) +# endif +# endif #else -#define MINLINE static inline -#if (defined(__APPLE__) && defined(__ppc__)) -/* static inline __attribute__ here breaks osx ppc gcc42 build */ -#define MALWAYS_INLINE static __attribute__((always_inline)) -#else -#define MALWAYS_INLINE static inline __attribute__((always_inline)) -#endif -#endif -#else -#define MINLINE -#define MALWAYS_INLINE +# define MINLINE +# define MALWAYS_INLINE #endif #ifdef __cplusplus @@ -60,4 +60,3 @@ extern "C" { #endif #endif /* __BLI_MATH_INLINE_H__ */ - |