Commit 964933db authored by Brian Sidebotham's avatar Brian Sidebotham
Browse files

Removed some Microsoft Visual C centric definitions in... 

Removed some Microsoft Visual C centric definitions in CMakeModules/config.h.cmake which were tripping up the mingw-w64 build
parent e45ed220

CMakeModules/PerformFeatureChecks.cmake

+0 −6
Original line number Diff line number Diff line
@@ -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)

CMakeModules/config.h.cmake

+0 −22
Original line number Diff line number Diff line
@@ -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.