diff options
author | Benoit Bolsee <benoit.bolsee@online.be> | 2008-08-18 02:28:30 +0400 |
---|---|---|
committer | Benoit Bolsee <benoit.bolsee@online.be> | 2008-08-18 02:28:30 +0400 |
commit | 9f6109002b158e4285d7c88ffc573f2cd4ac62ce (patch) | |
tree | 7f7d7d4ca070fded30a92f95f305059923c9f269 /source | |
parent | 904b97eee91a8e07e56dc6c58e69843cd9ec2369 (diff) |
Fix compile problem in MSVC after Win64 patch
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/imbuf/intern/cineon/logImageCore.h | 3 | ||||
-rw-r--r-- | source/blender/src/buttons_scene.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/cineon/logImageCore.h b/source/blender/imbuf/intern/cineon/logImageCore.h index 9b62b368915..2646e8b3c12 100644 --- a/source/blender/imbuf/intern/cineon/logImageCore.h +++ b/source/blender/imbuf/intern/cineon/logImageCore.h @@ -35,7 +35,8 @@ extern "C" { #endif #include "BLO_sys_types.h" // for intptr_t support - +#undef ntohl +#undef htonl typedef int (GetRowFn)(LogImageFile* logImage, unsigned short* row, int lineNum); typedef int (SetRowFn)(LogImageFile* logImage, const unsigned short* row, int lineNum); typedef void (CloseFn)(LogImageFile* logImage); diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c index dd0a904ab4f..5205be3e1b0 100644 --- a/source/blender/src/buttons_scene.c +++ b/source/blender/src/buttons_scene.c @@ -33,6 +33,7 @@ #include <string.h> #include "MEM_guardedalloc.h" +#include "BLO_sys_types.h" // for intptr_t support #include "DNA_node_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" |