philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn-r28218] Merge of r28138, 28196, and 28204 from trunk.

Browse Source 
hbool_t changes

Tested on: Ubuntu 15.04 (Linux 3.19 x86_64) gcc 4.9.2
           serial w/ Fortran and C++
           parallel (MPICH 3.1.4) w/ Fortran
This commit is contained in:
Dana Robinson
2015-10-26 03:10:12 -05:00
parent 8a1ca95768
commit 51b29b6ab4
35 changed files with 142 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
config/cmake_ext_mod/ConfigureChecks.cmake
View File

@@ -418,6 +418,19 @@ if (NOT ${HDF_PREFIX}_SIZEOF_OFF64_T)
set (${HDF_PREFIX}_SIZEOF_OFF64_T 0)
endif (NOT ${HDF_PREFIX}_SIZEOF_OFF64_T)
#-----------------------------------------------------------------------------
# Extra C99 types
#-----------------------------------------------------------------------------
# _Bool type support
CHECK_INCLUDE_FILE_CONCAT (stdbool.h ${HDF_PREFIX}_HAVE_STDBOOL_H)
if (HAVE_STDBOOL_H)
set (CMAKE_EXTRA_INCLUDE_FILES stdbool.h)
HDF_CHECK_TYPE_SIZE (bool ${HDF_PREFIX}_SIZEOF_BOOL)
else (HAVE_STDBOOL_H)
HDF_CHECK_TYPE_SIZE (_Bool ${HDF_PREFIX}_SIZEOF_BOOL)
endif (HAVE_STDBOOL_H)
if (NOT WINDOWS)
#-----------------------------------------------------------------------------
# Check if the dev_t type is a scalar type