diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-05-28 23:35:26 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-28 23:35:26 +0400 |
| commit | 225c5fee6b046b9829643f82cf6cbce159e4e007 (patch) | |
| tree | 4092b2c57ba33a616dd0a837b050d0c79f9bcc84 /intern/guardedalloc/MEM_guardedalloc.h | |
| parent | 60befcdc6297281ce226273123d3ccfc0a681aff (diff) | |
move BLO_sys_types.h -> BLI_sys_types.h (it had nothing todo with loading)
remove MEM_sys_types.h which was a duplicate.
Diffstat (limited to 'intern/guardedalloc/MEM_guardedalloc.h')
| -rw-r--r-- | intern/guardedalloc/MEM_guardedalloc.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h index beffaece865..d49dc4b4dd9 100644 --- a/intern/guardedalloc/MEM_guardedalloc.h +++ b/intern/guardedalloc/MEM_guardedalloc.h @@ -61,7 +61,9 @@ #define __MEM_GUARDEDALLOC_H__ #include <stdio.h> /* needed for FILE* */ -#include "MEM_sys_types.h" /* needed for uintptr_t */ + +/* needed for uintptr_t, exception, dont use BLI anywhere else in MEM_* */ +#include "../../source/blender/blenlib/BLI_sys_types.h" /* some GNU attributes are only available from GCC 4.3 */ #define MEM_GNU_ATTRIBUTES (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 403)) |