Fix compile problem in MSVC after Win64 patch

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);

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"