[Bf-blender-cvs] [31375a1] master: Cleanup: stdbool no longer optional, remove checks

Campbell Barton noreply at git.blender.org
Sat Jan 16 05:47:00 CET 2016


Commit: 31375a1b21a98f5ce6abdd46a41a1e287d3d5050
Author: Campbell Barton
Date:   Sat Jan 16 15:34:49 2016 +1100
Branches: master
https://developer.blender.org/rB31375a1b21a98f5ce6abdd46a41a1e287d3d5050

Cleanup: stdbool no longer optional, remove checks

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

M	CMakeLists.txt
M	build_files/cmake/macros.cmake
M	source/blender/blenlib/BLI_sys_types.h

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e91f4b5..1a2aa81 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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}")
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index edc5cf9..00313ba 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -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)
diff --git a/source/blender/blenlib/BLI_sys_types.h b/source/blender/blenlib/BLI_sys_types.h
index c9cf33f..7929e1d 100644
--- a/source/blender/blenlib/BLI_sys_types.h
+++ b/source/blender/blenlib/BLI_sys_types.h
@@ -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 
 }




More information about the Bf-blender-cvs mailing list