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 /source/blender/blenlib | |
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 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/blenlib/intern/BLI_ghash.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/endian_switch.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/fileops.c | 3 |
4 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index 0708b2fed4d..7bf21b79899 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -150,6 +150,7 @@ set(SRC BLI_string.h BLI_string_cursor_utf8.h BLI_string_utf8.h + BLI_sys_types.h BLI_threads.h BLI_utildefines.h BLI_uvproject.h diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c index b8e3d70ce99..749c008d8c3 100644 --- a/source/blender/blenlib/intern/BLI_ghash.c +++ b/source/blender/blenlib/intern/BLI_ghash.c @@ -35,11 +35,11 @@ #include "MEM_guardedalloc.h" +#include "BLI_sys_types.h" /* for intptr_t support */ #include "BLI_utildefines.h" #include "BLI_mempool.h" #include "BLI_ghash.h" -#include "MEM_sys_types.h" /* for intptr_t support */ /***/ #ifdef __GNUC__ diff --git a/source/blender/blenlib/intern/endian_switch.c b/source/blender/blenlib/intern/endian_switch.c index e3ed88b6f8d..892d7396011 100644 --- a/source/blender/blenlib/intern/endian_switch.c +++ b/source/blender/blenlib/intern/endian_switch.c @@ -24,7 +24,7 @@ * \ingroup bli */ -#include "MEM_sys_types.h" +#include "BLI_sys_types.h" #include "BLI_utildefines.h" #include "BLI_endian_switch.h" diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c index 26e1ea13076..d4a8b800f17 100644 --- a/source/blender/blenlib/intern/fileops.c +++ b/source/blender/blenlib/intern/fileops.c @@ -65,8 +65,7 @@ #include "BLI_string.h" #include "BLI_path_util.h" #include "BLI_fileops.h" - -#include "MEM_sys_types.h" // for intptr_t support +#include "BLI_sys_types.h" // for intptr_t support /* gzip the file in from and write it to "to". |