diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-18 00:56:25 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-18 00:56:25 +0400 |
| commit | 48006292d8b3c6c8dd4bfe87bdbe271db93cffff (patch) | |
| tree | ca98c07367717703c5a8801063cc42e0aff5b855 /source/blender/blenlib/BLI_math_inline.h | |
| parent | 4c66e696fbcaefe40f0394fea8fc4a55bb7d6994 (diff) | |
| parent | 61596d5bb365a96b4b19adf0ef72ec1ea47212aa (diff) | |
svn merge ^/trunk/blender -r44189:44204
Diffstat (limited to 'source/blender/blenlib/BLI_math_inline.h')
| -rw-r--r-- | source/blender/blenlib/BLI_math_inline.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenlib/BLI_math_inline.h b/source/blender/blenlib/BLI_math_inline.h index 83aeb6cb735..fcc5fb744bb 100644 --- a/source/blender/blenlib/BLI_math_inline.h +++ b/source/blender/blenlib/BLI_math_inline.h @@ -23,8 +23,8 @@ * ***** END GPL LICENSE BLOCK ***** * */ -#ifndef BLI_MATH_INLINE_H -#define BLI_MATH_INLINE_H +#ifndef __BLI_MATH_INLINE_H__ +#define __BLI_MATH_INLINE_H__ /** \file BLI_math_inline.h * \ingroup bli @@ -35,9 +35,9 @@ extern "C" { #endif /* add platform/compiler checks here if it is not supported */ -#define BLI_MATH_INLINE_H +#define __BLI_MATH_INLINE_H__ -#ifdef BLI_MATH_INLINE_H +#ifdef __BLI_MATH_INLINE_H__ #ifdef _MSC_VER #define MINLINE static __forceinline #define MALWAYS_INLINE MINLINE @@ -59,5 +59,5 @@ extern "C" { } #endif -#endif /* BLI_MATH_INLINE_H */ +#endif /* __BLI_MATH_INLINE_H__ */ |