From 964933db001922c10b6cc65e750d5f251b7c021b Mon Sep 17 00:00:00 2001
From: Brian Sidebotham <brian.sidebotham@gmail.com>
Date: Thu, 3 Oct 2013 23:53:42 +0100
Subject: [PATCH] Removed some Microsoft Visual C centric definitions in
 CMakeModules/config.h.cmake which were tripping up the mingw-w64 build

---
 CMakeModules/PerformFeatureChecks.cmake |  6 ------
 CMakeModules/config.h.cmake             | 22 ----------------------
 2 files changed, 28 deletions(-)

diff --git a/CMakeModules/PerformFeatureChecks.cmake b/CMakeModules/PerformFeatureChecks.cmake
index 2749d23ec9..86ad7c5a84 100644
--- a/CMakeModules/PerformFeatureChecks.cmake
+++ b/CMakeModules/PerformFeatureChecks.cmake
@@ -81,14 +81,8 @@ macro(perform_feature_checks)
     # Some platforms define malloc and free in malloc.h instead of stdlib.h.
     check_symbol_exists(malloc "stdlib.h" MALLOC_IN_STDLIB_H)
 
-    # Use ISO C++ conformant names to disable Visual C++ warnings.
-    check_symbol_exists(_stricmp "string.h" HAVE_ISO_STRICMP)
-    check_symbol_exists(_strnicmp "string.h" HAVE_ISO_STRNICMP)
-    check_symbol_exists(_snprintf "stdio.h" HAVE_ISO_SNPRINTF)
-
     # Check for functions in math.h.
     check_include_file("math.h" HAVE_MATH_H)
-    check_symbol_exists(_hypot "math.h" HAVE_ISO_HYPOT)
 
     # Check for functions in C++ cmath.
     check_include_file_cxx(cmath HAVE_CXX_CMATH)
diff --git a/CMakeModules/config.h.cmake b/CMakeModules/config.h.cmake
index 7f8cd4cd19..da209b0b39 100644
--- a/CMakeModules/config.h.cmake
+++ b/CMakeModules/config.h.cmake
@@ -7,27 +7,9 @@
 
 #cmakedefine HAVE_STRNCASECMP
 
-#cmakedefine HAVE_ISO_STRICMP
-
-#cmakedefine HAVE_ISO_STRNICMP
-
-#cmakedefine HAVE_ISO_SNPRINTF
-
-#if defined( HAVE_ISO_SNPRINTF )
-#define snprintf _snprintf
-#endif
-
-
 // Handle platform differences in math.h
 #cmakedefine HAVE_MATH_H
 
-#cmakedefine HAVE_ISO_HYPOT
-
-#if defined( HAVE_ISO_HYPOT )
-#define hypot _hypot
-#endif
-
-
 // Handle platform differences in C++ cmath.
 #cmakedefine HAVE_CXX_CMATH
 
@@ -57,14 +39,10 @@
 
 #if defined( HAVE_STRCASECMP )
 #define stricmp strcasecmp
-#elif defined( HAVE_ISO_STRICMP )
-#define stricmp _stricmp
 #endif
 
 #if defined( HAVE_STRNCASECMP )
 #define strnicmp strncasecmp
-#elif defined( HAVE_ISO_STRNICMP )
-#define strnicmp _strnicmp
 #endif
 
 // Use Posix getc_unlocked() instead of getc() when it's available.