[Bf-blender-cvs] [65f343690f1] temp-remove-mingw: MinGW: Remove more intern stuff

[Aaron Carlisle]

Commit: 65f343690f111320a810faee2e93d0d5bbd9776c
Author: Aaron Carlisle
Date:   Sun Apr 23 18:11:01 2017 -0400
Branches: temp-remove-mingw
https://developer.blender.org/rB65f343690f111320a810faee2e93d0d5bbd9776c

MinGW: Remove more intern stuff

===================================================================

M	intern/cycles/util/util_aligned_malloc.cpp
M	intern/cycles/util/util_optimization.h
M	intern/cycles/util/util_system.cpp
M	intern/cycles/util/util_types.h
M	intern/elbeem/intern/mvmcoords.h
M	intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
M	intern/guardedalloc/intern/mallocn_intern.h
M	intern/libmv/libmv/base/aligned_malloc.cc

===================================================================

diff --git a/intern/cycles/util/util_aligned_malloc.cpp b/intern/cycles/util/util_aligned_malloc.cpp
index cc7252dcc58..78669a17c72 100644
--- a/intern/cycles/util/util_aligned_malloc.cpp
+++ b/intern/cycles/util/util_aligned_malloc.cpp
@@ -23,13 +23,6 @@
 
 #if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
 /* Needed for memalign on Linux and _aligned_alloc on Windows. */
-#  ifdef FREE_WINDOWS
-/* Make sure _aligned_malloc is included. */
-#    ifdef __MSVCRT_VERSION__
-#      undef __MSVCRT_VERSION__
-#    endif
-#    define __MSVCRT_VERSION__ 0x0700
-#  endif  /* FREE_WINDOWS */
 #  include <malloc.h>
 #else
 /* Apple's malloc is 16-byte aligned, and does not have malloc.h, so include
diff --git a/intern/cycles/util/util_optimization.h b/intern/cycles/util/util_optimization.h
index b79c45d437b..32624c3764f 100644
--- a/intern/cycles/util/util_optimization.h
+++ b/intern/cycles/util/util_optimization.h
@@ -98,16 +98,5 @@
  *
  * We assume __KERNEL_SSEX__ flags to have been defined at this point */
 
-/* SSE intrinsics headers */
-#ifndef FREE_WINDOWS64
-
-#ifdef _MSC_VER
-#  include <intrin.h>
-#elif (defined(__x86_64__) || defined(__i386__))
-#  include <x86intrin.h>
-#endif
-
-#endif
-
 #endif /* __UTIL_OPTIMIZATION_H__ */
 
diff --git a/intern/cycles/util/util_system.cpp b/intern/cycles/util/util_system.cpp
index a942d738b8a..9c993d6ba08 100644
--- a/intern/cycles/util/util_system.cpp
+++ b/intern/cycles/util/util_system.cpp
@@ -22,9 +22,6 @@
 #include "util/util_string.h"
 
 #ifdef _WIN32
-#  if(!defined(FREE_WINDOWS))
-#    include <intrin.h>
-#  endif
 #  include "util_windows.h"
 #elif defined(__APPLE__)
 #  include <sys/sysctl.h>
@@ -105,7 +102,7 @@ unsigned short system_cpu_process_groups(unsigned short max_groups,
 #endif
 }
 
-#if !defined(_WIN32) || defined(FREE_WINDOWS)
+#if !defined(_WIN32)
 static void __cpuid(int data[4], int selector)
 {
 #ifdef __x86_64__
diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h
index 5a8f11694a7..fe7b7f6b2b5 100644
--- a/intern/cycles/util/util_types.h
+++ b/intern/cycles/util/util_types.h
@@ -43,7 +43,7 @@
 #define ccl_restrict __restrict
 #define __KERNEL_WITH_SSE_ALIGN__
 
-#if defined(_WIN32) && !defined(FREE_WINDOWS)
+#if defined(_WIN32)
 #define ccl_device_inline static __forceinline
 #define ccl_device_forceinline static __forceinline
 #define ccl_align(...) __declspec(align(__VA_ARGS__))
@@ -63,9 +63,6 @@
 #define ccl_device_inline static inline __attribute__((always_inline))
 #define ccl_device_forceinline static inline __attribute__((always_inline))
 #define ccl_align(...) __attribute__((aligned(__VA_ARGS__)))
-#ifndef FREE_WINDOWS64
-#define __forceinline inline __attribute__((always_inline))
-#endif
 #define ccl_try_align(...) __attribute__((aligned(__VA_ARGS__)))
 #define ccl_may_alias __attribute__((__may_alias__))
 #define ccl_always_inline __attribute__((always_inline))
diff --git a/intern/elbeem/intern/mvmcoords.h b/intern/elbeem/intern/mvmcoords.h
index 56d991aac6e..deeedcf9dd4 100644
--- a/intern/elbeem/intern/mvmcoords.h
+++ b/intern/elbeem/intern/mvmcoords.h
@@ -23,12 +23,10 @@
 #define mvmFloat double
 
 #ifdef WIN32
-#ifndef FREE_WINDOWS
 #include "float.h"
 #define isnan(n) _isnan(n)
 #define finite _finite
 #endif
-#endif
 
 #ifdef sun
 #include "ieeefp.h"
diff --git a/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp b/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
index 252ea775329..2dc24e12b34 100644
--- a/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
+++ b/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
@@ -41,9 +41,6 @@
 
 // We do not support multiple monitors at the moment
 #define COMPILE_MULTIMON_STUBS
-#ifndef FREE_WINDOWS
-#include <multimon.h>
-#endif
 
 
 GHOST_DisplayManagerWin32::GHOST_DisplayManagerWin32(void)
diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h
index 3f7e462c1c7..a292a2eb5a0 100644
--- a/intern/guardedalloc/intern/mallocn_intern.h
+++ b/intern/guardedalloc/intern/mallocn_intern.h
@@ -89,14 +89,6 @@
 
 #if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
 // Needed for memalign on Linux and _aligned_alloc on Windows.
-#  ifdef FREE_WINDOWS
-/* make sure _aligned_malloc is included */
-#    ifdef __MSVCRT_VERSION__
-#      undef __MSVCRT_VERSION__
-#    endif
-
-#    define __MSVCRT_VERSION__ 0x0700
-#  endif  // FREE_WINDOWS
 
 #  include <malloc.h>
 #else
diff --git a/intern/libmv/libmv/base/aligned_malloc.cc b/intern/libmv/libmv/base/aligned_malloc.cc
index cc0a5fbbba7..7a3231da9ac 100644
--- a/intern/libmv/libmv/base/aligned_malloc.cc
+++ b/intern/libmv/libmv/base/aligned_malloc.cc
@@ -23,14 +23,6 @@
 
 #if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
 // Needed for memalign on Linux and _aligned_alloc on Windows.
-#  ifdef FREE_WINDOWS
-/* make sure _aligned_malloc is included */
-#    ifdef __MSVCRT_VERSION__
-#      undef __MSVCRT_VERSION__
-#    endif
-
-#    define __MSVCRT_VERSION__ 0x0700
-#  endif  // FREE_WINDOWS
 
 #  include <malloc.h>
 #else