Commit f3a9d337 authored by Dan Lipsa's avatar Dan Lipsa

Fix compilation after upgrade to hdf5-1.8.13

Change-Id: Ic60cf08807763bc0737a73b6a7611a3de62958f9
parent e16fac17
cmake_minimum_required (VERSION 2.8.11)
if(POLICY CMP0025)
cmake_policy(SET CMP0025 NEW) # CMake 3.0
endif()
if(POLICY CMP0053)
cmake_policy(SET CMP0053 NEW) # CMake 3.1
endif()
PROJECT (HDF5 C CXX)
#-----------------------------------------------------------------------------
......@@ -29,7 +35,7 @@ PROJECT (HDF5 C CXX)
# dependencies to this variable so that external projects pick them up
#
# HDF5_EXTERNAL_LIB_PREFIX :
# If the parent project needs to install hdf libraries, but avoid
# If the parent project needs to install hdf libraries, but avoid
# name conflicts with system versions, then a prefix may be added
# to ensure that the correct versions configured are used.
#
......@@ -44,28 +50,28 @@ PROJECT (HDF5 C CXX)
# any project making use of this build of HDF5 will use the correct zlib
#
# # Tell hdf5 that we are manually overriding certain settings
# set (HDF5_EXTERNALLY_CONFIGURED 1)
set (HDF5_EXTERNALLY_CONFIGURED 1)
# # Avoid duplicating names of installed libraries
# set (HDF5_EXTERNAL_LIB_PREFIX "vtk")
set (HDF5_EXTERNAL_LIB_PREFIX "vtk")
# # Export configuration to this export variable
# set (HDF5_EXPORTED_TARGETS "paraview-targets")
set (HDF5_EXPORTED_TARGETS ${VTK_INSTALL_EXPORT_NAME})
#
# # Setup all necessary overrides for zlib so that HDF5 uses our
# # internally compiled zlib rather than any other version
# if (HDF5_ENABLE_Z_LIB_SUPPORT)
# # We must tell the main HDF5 library that it depends on our zlib
# set (HDF5_LIB_DEPENDENCIES vtkzlib)
# # Override the zlib header file
# if (VTK_USE_SYSTEM_ZLIB)
# set (H5_ZLIB_HEADER "zlib.h")
# else (VTK_USE_SYSTEM_ZLIB)
# set (H5_ZLIB_HEADER "vtk_zlib.h")
# # Set vars that FindZlib would have set if used in sub project
# set (ZLIB_INCLUDE_DIRS "${VTK_ZLIB_INCLUDE_DIRS}")
# set (ZLIB_LIBRARIES vtkzlib)
# endif (VTK_USE_SYSTEM_ZLIB)
# endif (HDF5_ENABLE_Z_LIB_SUPPORT)
#
if (HDF5_ENABLE_Z_LIB_SUPPORT)
# We must tell the main HDF5 library that it depends on our zlib
set (HDF5_LIB_DEPENDENCIES vtkzlib)
# Override the zlib header file
if (VTK_USE_SYSTEM_ZLIB)
set (H5_ZLIB_HEADER "zlib.h")
else (VTK_USE_SYSTEM_ZLIB)
set (H5_ZLIB_HEADER "vtk_zlib.h")
# Set vars that FindZlib would have set if used in sub project
set (ZLIB_INCLUDE_DIRS "${VTK_ZLIB_INCLUDE_DIRS}")
set (ZLIB_LIBRARIES vtkzlib)
endif (VTK_USE_SYSTEM_ZLIB)
endif (HDF5_ENABLE_Z_LIB_SUPPORT)
# # Add the sub project
# add_subdirectory (Utilities/hdf5-1.8)
#-----------------------------------------------------------------------------
......@@ -120,18 +126,18 @@ set (HDF5_HL_F90_C_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_HL_F90_C_LIB_
#-----------------------------------------------------------------------------
# Set the target names of all the libraries
#-----------------------------------------------------------------------------
set (HDF5_LIB_TARGET ${HDF5_LIB_CORENAME})
set (HDF5_TEST_LIB_TARGET ${HDF5_TEST_LIB_CORENAME})
set (HDF5_CPP_LIB_TARGET ${HDF5_CPP_LIB_CORENAME})
set (HDF5_HL_LIB_TARGET ${HDF5_HL_LIB_CORENAME})
set (HDF5_HL_CPP_LIB_TARGET ${HDF5_HL_CPP_LIB_CORENAME})
set (HDF5_TOOLS_LIB_TARGET ${HDF5_TOOLS_LIB_CORENAME})
set (HDF5_F90_LIB_TARGET ${HDF5_F90_LIB_CORENAME})
set (HDF5_F90_C_LIB_TARGET ${HDF5_F90_C_LIB_CORENAME})
set (HDF5_F90_TEST_LIB_TARGET ${HDF5_F90_TEST_LIB_CORENAME})
set (HDF5_F90_C_TEST_LIB_TARGET ${HDF5_F90_C_TEST_LIB_CORENAME})
set (HDF5_HL_F90_LIB_TARGET ${HDF5_HL_F90_LIB_CORENAME})
set (HDF5_HL_F90_C_LIB_TARGET ${HDF5_HL_F90_C_LIB_CORENAME})
set (HDF5_LIB_TARGET ${HDF5_LIB_NAME})
set (HDF5_TEST_LIB_TARGET ${HDF5_TEST_LIB_NAME})
set (HDF5_CPP_LIB_TARGET ${HDF5_CPP_LIB_NAME})
set (HDF5_HL_LIB_TARGET ${HDF5_HL_LIB_NAME})
set (HDF5_HL_CPP_LIB_TARGET ${HDF5_HL_CPP_LIB_NAME})
set (HDF5_TOOLS_LIB_TARGET ${HDF5_TOOLS_LIB_NAME})
set (HDF5_F90_LIB_TARGET ${HDF5_F90_LIB_NAME})
set (HDF5_F90_C_LIB_TARGET ${HDF5_F90_C_LIB_NAME})
set (HDF5_F90_TEST_LIB_TARGET ${HDF5_F90_TEST_LIB_NAME})
set (HDF5_F90_C_TEST_LIB_TARGET ${HDF5_F90_C_TEST_LIB_NAME})
set (HDF5_HL_F90_LIB_TARGET ${HDF5_HL_F90_LIB_NAME})
set (HDF5_HL_F90_C_LIB_TARGET ${HDF5_HL_F90_C_LIB_NAME})
#-----------------------------------------------------------------------------
# Define some CMake variables for use later in the project
......@@ -245,7 +251,7 @@ endif (NOT HDF5_EXTERNALLY_CONFIGURED)
#-----------------------------------------------------------------------------
# Targets built within this project are exported at Install time for use
# by other projects using FindHDF5.
# by other projects using FindHDF5.
#-----------------------------------------------------------------------------
if (NOT HDF5_EXPORTED_TARGETS)
set (HDF5_EXPORTED_TARGETS "hdf5-targets")
......@@ -303,7 +309,7 @@ option (HDF5_ENABLE_COVERAGE "Enable code coverage for Libraries and Programs" O
if (HDF5_ENABLE_COVERAGE)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
set (LDFLAGS "${LDFLAGS} -fprofile-arcs -ftest-coverage")
set (LDFLAGS "${LDFLAGS} -fprofile-arcs -ftest-coverage")
endif (HDF5_ENABLE_COVERAGE)
#-----------------------------------------------------------------------------
......@@ -312,7 +318,7 @@ endif (HDF5_ENABLE_COVERAGE)
# option (HDF5_ENABLE_USING_DMALLOC "Indicate that dmalloc is used" OFF)
# if (HDF5_ENABLE_USING_DMALLOC)
# find_package (DMALLOC)
# set (H5_HAVE_DMALLOC DMALLOC_FOUND)
# set (H5_HAVE_DMALLOC DMALLOC_FOUND)
# endif (HDF5_ENABLE_USING_DMALLOC)
#-----------------------------------------------------------------------------
......@@ -320,7 +326,7 @@ endif (HDF5_ENABLE_COVERAGE)
#-----------------------------------------------------------------------------
option (HDF5_ENABLE_USING_MEMCHECKER "Indicate that a memory checker is used" OFF)
if (HDF5_ENABLE_USING_MEMCHECKER)
set (H5_USING_MEMCHECKER 1)
set (H5_USING_MEMCHECKER 1)
endif (HDF5_ENABLE_USING_MEMCHECKER)
#-----------------------------------------------------------------------------
......@@ -328,9 +334,9 @@ endif (HDF5_ENABLE_USING_MEMCHECKER)
#-----------------------------------------------------------------------------
option (HDF5_ENABLE_DEPRECATED_SYMBOLS "Enable deprecated public API symbols" ON)
if (HDF5_ENABLE_DEPRECATED_SYMBOLS)
set (H5_NO_DEPRECATED_SYMBOLS 0)
set (H5_NO_DEPRECATED_SYMBOLS 0)
else (HDF5_ENABLE_DEPRECATED_SYMBOLS)
set (H5_NO_DEPRECATED_SYMBOLS 1)
set (H5_NO_DEPRECATED_SYMBOLS 1)
endif (HDF5_ENABLE_DEPRECATED_SYMBOLS)
#-----------------------------------------------------------------------------
......@@ -517,7 +523,7 @@ if (NOT MSVC)
# Append more extra warning flags that only gcc 4.7+ know about
set (H5_CFLAGS5 "${H5_CFLAGS5} -Wstack-usage=8192 -Wvector-operation-performance -Wsuggest-attribute=pure -Wsuggest-attribute=noreturn")
endif (NOT MSVC)
#-----------------------------------------------------------------------------
# Option to allow the user to enable all warnings
#-----------------------------------------------------------------------------
......@@ -642,7 +648,7 @@ if (HDF5_ENABLE_PARALLEL)
# MPI checks, only do these if MPI_C_FOUND is true, otherwise they always fail
# and once set, they are cached as false and not regenerated
set (CMAKE_REQUIRED_LIBRARIES "${MPI_C_LIBRARIES}" )
CHECK_FUNCTION_EXISTS (MPI_File_get_size H5_HAVE_MPI_GET_SIZE)
CHECK_FUNCTION_EXISTS (MPI_File_get_size H5_HAVE_MPI_GET_SIZE)
set (H5_MPI_FILE_SET_SIZE_BIG 1)
# Used by Fortran + MPI
CHECK_SYMBOL_EXISTS (MPI_Comm_c2f "${MPI_C_INCLUDE_PATH}/mpi.h" H5_HAVE_MPI_MULTI_LANG_Comm)
......@@ -688,7 +694,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED)
if (HDF5_ENABLE_Z_LIB_SUPPORT AND ZLIB_FOUND)
PACKAGE_ZLIB_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT})
endif (HDF5_ENABLE_Z_LIB_SUPPORT AND ZLIB_FOUND)
if (HDF5_ENABLE_SZIP_SUPPORT AND SZIP_FOUND)
PACKAGE_SZIP_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT})
endif (HDF5_ENABLE_SZIP_SUPPORT AND SZIP_FOUND)
......@@ -697,7 +703,7 @@ endif (NOT HDF5_EXTERNALLY_CONFIGURED)
#-----------------------------------------------------------------------------
# Option to use threadsafe
# Note: Currently CMake only allows configuring of threadsafe on
# Note: Currently CMake only allows configuring of threadsafe on
# non-Cygwin WINDOWS.
#-----------------------------------------------------------------------------
if (WIN32)
......@@ -775,7 +781,7 @@ if (BUILD_TESTING)
option (HDF5_TEST_FHEAP_VFD "Execute tests with different VFDs" ON)
mark_as_advanced (HDF5_TEST_FHEAP_VFD)
endif (HDF5_TEST_VFD)
include (${HDF5_SOURCE_DIR}/CTestConfig.cmake)
configure_file (${HDF5_RESOURCES_DIR}/CTestCustom.cmake ${HDF5_BINARY_DIR}/CTestCustom.ctest @ONLY)
endif (BUILD_TESTING)
......
......@@ -11,10 +11,11 @@ branch, but it is merged into our history.
Update hdf5 from upstream as follows. Create a local branch to
explicitly reference the upstream snapshot branch head:
git branch hdf5-upstream 8e37142d
git branch hdf5-upstream 8d8063fa
Use a temporary directory to checkout the branch:
cd ~/src/VTK
mkdir hdf5-tmp
cd hdf5-tmp
git init
......@@ -24,7 +25,7 @@ Use a temporary directory to checkout the branch:
Now place the (reduced) hdf5 content in this directory. See
instructions shown by
git log 8e37142d
git log 8d8063fa
for help extracting the content from the upstream svn repo. Then run
the following commands to commit the new version. Substitute the
......@@ -46,13 +47,16 @@ content. Then push the changes back up to the main repository:
cd ..
rm -rf hdf5-tmp
Make sure your commit in 'hdf5-upstream' has a 'Change-Id: ...', otherwise
you won't be able to commit your change into gerrit.
Create a topic in the main repository on which to perform the update:
git checkout -b update-hdf5 master
Merge the hdf5-upstream branch as a subtree:
git merge -s subtree hdf5-upstream
git merge -X subtree=ThirdParty/hdf5/vtkhdf5 hdf5-upstream
If there are conflicts, resolve them and commit. Build and test the
tree. Commit any additional changes needed to succeed.
......
File mode changed from 100755 to 100644
......@@ -40,7 +40,7 @@ H5_SET_LIB_OPTIONS (${HDF5_HL_LIB_TARGET} ${HDF5_HL_LIB_NAME} ${LIB_TYPE})
set_target_properties (${HDF5_HL_LIB_TARGET} PROPERTIES
FOLDER libraries/hl
INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
)
DEFINE_SYMBOL ${HDF5_HL_LIB_CORENAME}_EXPORTS)
set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_LIB_TARGET}")
#-----------------------------------------------------------------------------
......@@ -72,4 +72,4 @@ if (HDF5_EXPORTED_TARGETS AND NOT VTK_INSTALL_NO_LIBRARIES)
ARCHIVE DESTINATION ${VTK_INSTALL_LIBRARY_DIR} COMPONENT hllibraries
RUNTIME DESTINATION ${VTK_INSTALL_RUNTIME_DIR} COMPONENT hllibraries
)
endif (HDF5_EXPORTED_TARGETS)
endif ()
......@@ -27,27 +27,27 @@
*-------------------------------------------------------------------------
*/
H5_HLDLL herr_t H5LT_get_attribute_disk( hid_t obj_id,
herr_t H5LT_get_attribute_disk( hid_t obj_id,
const char *attr_name,
void *data );
H5_HLDLL herr_t H5LT_set_attribute_numerical( hid_t loc_id,
herr_t H5LT_set_attribute_numerical( hid_t loc_id,
const char *obj_name,
const char *attr_name,
size_t size,
hid_t type_id,
const void *data );
H5_HLDLL herr_t H5LT_set_attribute_string( hid_t dset_id,
const char *name,
const char *buf );
herr_t H5LT_set_attribute_string( hid_t dset_id,
const char *name,
const char *buf );
H5_HLDLL herr_t H5LT_find_attribute( hid_t loc_id, const char *name );
herr_t H5LT_find_attribute( hid_t loc_id, const char *name );
H5_HLDLL char* H5LT_dtype_to_text(hid_t dtype, char *dt_str, H5LT_lang_t lang,
char* H5LT_dtype_to_text(hid_t dtype, char *dt_str, H5LT_lang_t lang,
size_t *slen, hbool_t no_user_buf);
H5_HLDLL int H5LTyyparse(void);
int H5LTyyparse(void);
#endif
......@@ -14,18 +14,30 @@ nm libhdf5_hl_debug.dylib | grep " [TR] " | awk '{print "#define "$3" vtk_"$3}'
Then on Linux I did the following to add symbols:
nm lib/libhdf5_hl_debug.so | grep -v vtk__ | grep " [ABCDGNRSTVW] " | awk '{print "#define "$3" vtk__"$3}' >> ../VTK/Utilities/vtkhdf5/hl/src/vtk_libhdf5_hl_mangle.h
nm libhdf5_hl.so | grep " [ABCDGNRSTVW] " | awk '{print "#define "$3" vtk__"$3}' >> ~/src/VTK/ThirdParty/hdf5/vtkhdf5/hl/src/vtk_libhdf5_hl_mangle.h
*/
#define H5DS_get_REFLIST_type vtk__H5DS_get_REFLIST_type
#define H5DS_is_reserved vtk__H5DS_is_reserved
#define arr_stack vtk__arr_stack
#define asindex vtk__asindex
#define __bss_start vtk____bss_start
#define cmpd_stack vtk__cmpd_stack
#define csindex vtk__csindex
#define _edata vtk___edata
#define _end vtk___end
#define enum_id vtk__enum_id
#define enum_memb_symbol vtk__enum_memb_symbol
#define _fini vtk___fini
#define first_quote vtk__first_quote
#define H5DOwrite_chunk vtk__H5DOwrite_chunk
#define H5DSattach_scale vtk__H5DSattach_scale
#define H5DSdetach_scale vtk__H5DSdetach_scale
#define H5DSget_label vtk__H5DSget_label
#define H5DSget_num_scales vtk__H5DSget_num_scales
#define H5DS_get_REFLIST_type vtk__H5DS_get_REFLIST_type
#define H5DSget_scale_name vtk__H5DSget_scale_name
#define H5DSis_attached vtk__H5DSis_attached
#define H5DS_is_reserved vtk__H5DS_is_reserved
#define H5DSis_scale vtk__H5DSis_scale
#define H5DSiterate_scales vtk__H5DSiterate_scales
#define H5DSset_label vtk__H5DSset_label
......@@ -44,15 +56,13 @@ nm lib/libhdf5_hl_debug.so | grep -v vtk__ | grep " [ABCDGNRSTVW] " | awk '{prin
#define H5IMread_image vtk__H5IMread_image
#define H5IMunlink_palette vtk__H5IMunlink_palette
#define H5LT_dtype_to_text vtk__H5LT_dtype_to_text
#define H5LT_find_attribute vtk__H5LT_find_attribute
#define H5LT_get_attribute_disk vtk__H5LT_get_attribute_disk
#define H5LT_set_attribute_numerical vtk__H5LT_set_attribute_numerical
#define H5LT_set_attribute_string vtk__H5LT_set_attribute_string
#define H5LTdtype_to_text vtk__H5LTdtype_to_text
#define H5LT_find_attribute vtk__H5LT_find_attribute
#define H5LTfind_attribute vtk__H5LTfind_attribute
#define H5LTfind_dataset vtk__H5LTfind_dataset
#define H5LTget_attribute vtk__H5LTget_attribute
#define H5LTget_attribute_char vtk__H5LTget_attribute_char
#define H5LT_get_attribute_disk vtk__H5LT_get_attribute_disk
#define H5LTget_attribute_double vtk__H5LTget_attribute_double
#define H5LTget_attribute_float vtk__H5LTget_attribute_float
#define H5LTget_attribute_info vtk__H5LTget_attribute_info
......@@ -76,6 +86,8 @@ nm lib/libhdf5_hl_debug.so | grep -v vtk__ | grep " [ABCDGNRSTVW] " | awk '{prin
#define H5LTmake_dataset_long vtk__H5LTmake_dataset_long
#define H5LTmake_dataset_short vtk__H5LTmake_dataset_short
#define H5LTmake_dataset_string vtk__H5LTmake_dataset_string
#define H5LTopen_file_image vtk__H5LTopen_file_image
#define H5LTpath_valid vtk__H5LTpath_valid
#define H5LTread_dataset vtk__H5LTread_dataset
#define H5LTread_dataset_char vtk__H5LTread_dataset_char
#define H5LTread_dataset_double vtk__H5LTread_dataset_double
......@@ -90,28 +102,53 @@ nm lib/libhdf5_hl_debug.so | grep -v vtk__ | grep " [ABCDGNRSTVW] " | awk '{prin
#define H5LTset_attribute_int vtk__H5LTset_attribute_int
#define H5LTset_attribute_long vtk__H5LTset_attribute_long
#define H5LTset_attribute_long_long vtk__H5LTset_attribute_long_long
#define H5LT_set_attribute_numerical vtk__H5LT_set_attribute_numerical
#define H5LTset_attribute_short vtk__H5LTset_attribute_short
#define H5LT_set_attribute_string vtk__H5LT_set_attribute_string
#define H5LTset_attribute_string vtk__H5LTset_attribute_string
#define H5LTset_attribute_uchar vtk__H5LTset_attribute_uchar
#define H5LTset_attribute_uint vtk__H5LTset_attribute_uint
#define H5LTset_attribute_ulong vtk__H5LTset_attribute_ulong
#define H5LTset_attribute_ushort vtk__H5LTset_attribute_ushort
#define H5LTtext_to_dtype vtk__H5LTtext_to_dtype
#define H5LTyychar vtk__H5LTyychar
#define H5LTyycheck vtk__H5LTyycheck
#define H5LTyy_create_buffer vtk__H5LTyy_create_buffer
#define H5LTyydebug vtk__H5LTyydebug
#define H5LTyydefred vtk__H5LTyydefred
#define H5LTyy_delete_buffer vtk__H5LTyy_delete_buffer
#define H5LTyydgoto vtk__H5LTyydgoto
#define H5LTyyerrflag vtk__H5LTyyerrflag
#define H5LTyyerror vtk__H5LTyyerror
#define H5LTyy_flush_buffer vtk__H5LTyy_flush_buffer
#define H5LTyygindex vtk__H5LTyygindex
#define H5LTyyin vtk__H5LTyyin
#define H5LTyy_init_buffer vtk__H5LTyy_init_buffer
#define H5LTyylen vtk__H5LTyylen
#define H5LTyyleng vtk__H5LTyyleng
#define H5LTyylex vtk__H5LTyylex
#define H5LTyylhs vtk__H5LTyylhs
#define H5LTyy_load_buffer_state vtk__H5LTyy_load_buffer_state
#define H5LTyylval vtk__H5LTyylval
#define H5LTyynerrs vtk__H5LTyynerrs
#define H5LTyyout vtk__H5LTyyout
#define H5LTyyparse vtk__H5LTyyparse
#define H5LTyyrestart vtk__H5LTyyrestart
#define H5LTyyrindex vtk__H5LTyyrindex
#define H5LTyy_scan_buffer vtk__H5LTyy_scan_buffer
#define H5LTyy_scan_bytes vtk__H5LTyy_scan_bytes
#define H5LTyy_scan_string vtk__H5LTyy_scan_string
#define H5LTyysindex vtk__H5LTyysindex
#define H5LTyyss vtk__H5LTyyss
#define H5LTyysslim vtk__H5LTyysslim
#define H5LTyyssp vtk__H5LTyyssp
#define H5LTyystacksize vtk__H5LTyystacksize
#define H5LTyy_switch_to_buffer vtk__H5LTyy_switch_to_buffer
#define H5LTyyerror vtk__H5LTyyerror
#define H5LTyyin vtk__H5LTyyin
#define H5LTyylex vtk__H5LTyylex
#define H5LTyyout vtk__H5LTyyout
#define H5LTyyparse vtk__H5LTyyparse
#define H5LTyyrestart vtk__H5LTyyrestart
#define H5LTyytable vtk__H5LTyytable
#define H5LTyytext vtk__H5LTyytext
#define H5LTyyval vtk__H5LTyyval
#define H5LTyyvs vtk__H5LTyyvs
#define H5LTyyvsp vtk__H5LTyyvsp
#define H5LTyywrap vtk__H5LTyywrap
#define H5PTappend vtk__H5PTappend
#define H5PTclose vtk__H5PTclose
......@@ -124,13 +161,13 @@ nm lib/libhdf5_hl_debug.so | grep -v vtk__ | grep " [ABCDGNRSTVW] " | awk '{prin
#define H5PTopen vtk__H5PTopen
#define H5PTread_packets vtk__H5PTread_packets
#define H5PTset_index vtk__H5PTset_index
#define H5TBadd_records_from vtk__H5TBadd_records_from
#define H5TBAget_fill vtk__H5TBAget_fill
#define H5TBAget_title vtk__H5TBAget_title
#define H5TB_common_append_records vtk__H5TB_common_append_records
#define H5TB_common_read_records vtk__H5TB_common_read_records
#define H5TBadd_records_from vtk__H5TBadd_records_from
#define H5TBappend_records vtk__H5TBappend_records
#define H5TBcombine_tables vtk__H5TBcombine_tables
#define H5TB_common_append_records vtk__H5TB_common_append_records
#define H5TB_common_read_records vtk__H5TB_common_read_records
#define H5TBdelete_field vtk__H5TBdelete_field
#define H5TBdelete_record vtk__H5TBdelete_record
#define H5TBget_field_info vtk__H5TBget_field_info
......@@ -145,11 +182,9 @@ nm lib/libhdf5_hl_debug.so | grep -v vtk__ | grep " [ABCDGNRSTVW] " | awk '{prin
#define H5TBwrite_fields_index vtk__H5TBwrite_fields_index
#define H5TBwrite_fields_name vtk__H5TBwrite_fields_name
#define H5TBwrite_records vtk__H5TBwrite_records
#define asindex vtk__asindex
#define cmpd_stack vtk__cmpd_stack
#define csindex vtk__csindex
#define first_quote vtk__first_quote
#define indent vtk__indent
#define _init vtk___init
#define input_len vtk__input_len
#define is_enum vtk__is_enum
#define is_enum_memb vtk__is_enum_memb
#define is_opq_size vtk__is_opq_size
......@@ -157,41 +192,8 @@ nm lib/libhdf5_hl_debug.so | grep -v vtk__ | grep " [ABCDGNRSTVW] " | awk '{prin
#define is_str_pad vtk__is_str_pad
#define is_str_size vtk__is_str_size
#define is_variable vtk__is_variable
#define my_yyinput vtk__my_yyinput
#define H5LTyychar vtk__H5LTyychar
#define H5LTyycheck vtk__H5LTyycheck
#define H5LTyydebug vtk__H5LTyydebug
#define H5LTyydefred vtk__H5LTyydefred
#define H5LTyydgoto vtk__H5LTyydgoto
#define H5LTyyerrflag vtk__H5LTyyerrflag
#define H5LTyygindex vtk__H5LTyygindex
#define H5LTyylen vtk__H5LTyylen
#define H5LTyyleng vtk__H5LTyyleng
#define H5LTyylhs vtk__H5LTyylhs
#define H5LTyylval vtk__H5LTyylval
#define H5LTyynerrs vtk__H5LTyynerrs
#define H5LTyyrindex vtk__H5LTyyrindex
#define H5LTyysindex vtk__H5LTyysindex
#define H5LTyyss vtk__H5LTyyss
#define H5LTyysslim vtk__H5LTyysslim
#define H5LTyyssp vtk__H5LTyyssp
#define H5LTyystacksize vtk__H5LTyystacksize
#define H5LTyytable vtk__H5LTyytable
#define H5LTyytext vtk__H5LTyytext
#define H5LTyyval vtk__H5LTyyval
#define H5LTyyvs vtk__H5LTyyvs
#define H5LTyyvsp vtk__H5LTyyvsp
#define __bss_start vtk____bss_start
#define _edata vtk___edata
#define _end vtk___end
#define _fini vtk___fini
#define _init vtk___init
#define arr_stack vtk__arr_stack
#define enum_id vtk__enum_id
#define enum_memb_symbol vtk__enum_memb_symbol
#define input_len vtk__input_len
#define myinput vtk__myinput
#define my_yyinput vtk__my_yyinput
#define str_cset vtk__str_cset
#define str_pad vtk__str_pad
#define str_size vtk__str_size
......
This diff is collapsed.
......@@ -44,10 +44,15 @@ static const char *FileHeader = "\n\
#include <stdio.h>
#include <time.h>
#include "H5private.h"
#include "vtk_libhdf5_mangle.h"
#define LIBSETTINGSFNAME "libhdf5.settings"
#define xstr(s) str(s)
#define str(s) #s
/*-------------------------------------------------------------------------
* Function: insert_libhdf5_settings
*
......@@ -78,7 +83,7 @@ insert_libhdf5_settings(FILE *flibinfo)
/* print variable definition and the string */
/* Do not use const else AIX strings does not show it. */
fprintf(flibinfo, "char H5libhdf5_settings[]=\n");
fprintf(flibinfo, "char " xstr(H5libhdf5_settings) "[]=\n");
bol++;
while(EOF != (inchar = HDgetc(fsettings))) {
if(bol) {
......@@ -112,7 +117,7 @@ insert_libhdf5_settings(FILE *flibinfo)
#else
/* print variable definition and an empty string */
/* Do not use const else AIX strings does not show it. */
fprintf(flibinfo, "char H5libhdf5_settings[]=\"\";\n");
fprintf(flibinfo, "char " xstr(H5libhdf5_settings) "[]=\"\";\n");
#endif
} /* insert_libhdf5_settings() */
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment