diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-10-30 21:16:37 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-10-30 21:16:37 +0400 |
commit | 001259ccb6a8dbe0c70e4eb0f47a82b9b574d3b4 (patch) | |
tree | acb3aa815ebe1f3ce355e8677a78af8e6f89d0e7 /source/blender/blenkernel | |
parent | c69f2eaca97084e0e830756b574c9ec8a55c6643 (diff) |
warning/portability fixes.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_brush.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_utildefines.h | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h index 25d0eb5bc36..5afab9af9b3 100644 --- a/source/blender/blenkernel/BKE_brush.h +++ b/source/blender/blenkernel/BKE_brush.h @@ -36,7 +36,7 @@ struct Brush; struct ImBuf; struct Scene; struct wmOperator; -enum CurveMappingPreset; +// enum CurveMappingPreset; /* datablock functions */ struct Brush *add_brush(const char *name); diff --git a/source/blender/blenkernel/BKE_utildefines.h b/source/blender/blenkernel/BKE_utildefines.h index 016aef4d865..a7b4a71c84d 100644 --- a/source/blender/blenkernel/BKE_utildefines.h +++ b/source/blender/blenkernel/BKE_utildefines.h @@ -279,8 +279,11 @@ behaviour, though it may not be the best in practice. /*little macro so inline keyword works*/ #if defined(_MSC_VER) #define BM_INLINE static __forceinline -#else +#elif defined(__GNUC__) #define BM_INLINE static inline __attribute((always_inline)) +#else +#warning "MSC/GNUC defines not found, inline non-functional" +#define BM_INLINE static #endif #define BMEMSET(mem, val, size) {unsigned int _i; char *_c = (char*) mem; for (_i=0; _i<size; _i++) *_c++ = val;} |