Cleanup: stdbool no longer optional, remove checks
authorCampbell Barton <ideasman42@gmail.com>
Sat, 16 Jan 2016 04:34:49 +0000 (15:34 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 16 Jan 2016 04:38:57 +0000 (15:38 +1100)
CMakeLists.txt
build_files/cmake/macros.cmake
source/blender/blenlib/BLI_sys_types.h

index e91f4b503a23b51d88eac6c001c41c4d4239e23f..1a2aa8140c28ce604924fd92e39ebff194406aa0 100644 (file)
@@ -726,11 +726,6 @@ else()
        set(COMPILER_SSE2_FLAG)
 endif()
 
-TEST_STDBOOL_SUPPORT()
-if(HAVE_STDBOOL_H)
-       add_definitions(-DHAVE_STDBOOL_H)
-endif()
-
 TEST_SHARED_PTR_SUPPORT()
 TEST_UNORDERED_MAP_SUPPORT()
 
@@ -3051,9 +3046,6 @@ if(FIRST_RUN)
                info_cfg_option(WITH_GL_ANGLE)
        endif()
 
-       # debug
-       message(STATUS "HAVE_STDBOOL_H = ${HAVE_STDBOOL_H}")
-
        info_cfg_text("")
 
        message("${_config_msg}")
index edc5cf925c9fa9c95d65cf36a08204a10e02e94a..00313ba36d7480a11191c94ca8796118469dc6a8 100644 (file)
@@ -799,17 +799,6 @@ macro(TEST_SSE_SUPPORT
        unset(CMAKE_REQUIRED_FLAGS)
 endmacro()
 
-macro(TEST_STDBOOL_SUPPORT)
-       include(CheckCSourceRuns)
-
-       # This program will compile correctly if and only if
-       # this C compiler supports C99 stdbool.
-       check_c_source_runs("
-               #include <stdbool.h>
-               int main(void) { return (int)false; }"
-       HAVE_STDBOOL_H)
-endmacro()
-
 # Only print message if running CMake first time
 macro(message_first_run)
        if(FIRST_RUN)
index c9cf33f2f69ecffc9c7fa44faa4589aba58e71b9..7929e1d655145e3c8ac7df006eccee1d90a4ac06 100644 (file)
@@ -78,25 +78,7 @@ typedef uint64_t u_int64_t;
 #endif /* ifdef platform for types */
 
 #include <stddef.h>  /* size_t define */
-
-#ifdef HAVE_STDBOOL_H
-# include <stdbool.h>
-#elif !defined(__bool_true_false_are_defined) && !defined(__BOOL_DEFINED)
-# ifndef HAVE__BOOL
-#  ifdef __cplusplus
-typedef bool _BLI_Bool;
-#  else
-/* Make sure bool is alays defined with the same size for both C and C++ */
-#   define _BLI_Bool unsigned char
-#  endif
-# else
-#  define _BLI_Bool _Bool
-# endif
-# define bool _BLI_Bool
-# define false 0
-# define true 1
-# define __bool_true_false_are_defined 1
-#endif
+#include <stdbool.h>
 
 #ifdef __cplusplus 
 }