From 87fcc4930be42dbe2236bdad58f0941bc3fd58f7 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Fri, 16 Oct 2015 18:13:18 +0200 Subject: [PATCH] h5core: - H5_VER_STRING defined from PACKAGE_VERSION as const char* --- src/h5core/h5_init.c | 13 ++++++++++++- src/include/h5core/h5_types.h | 5 ++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/h5core/h5_init.c b/src/h5core/h5_init.c index 19d8f76..bad9934 100644 --- a/src/h5core/h5_init.c +++ b/src/h5core/h5_init.c @@ -1,8 +1,19 @@ +/* + Copyright (c) 2006-2015, The Regents of the University of California, + through Lawrence Berkeley National Laboratory (subject to receipt of any + required approvals from the U.S. Dept. of Energy) and the Paul Scherrer + Institut (Switzerland). All rights reserved. + + License: see file COPYING in top level of source distribution. +*/ + #include #include /* va_arg - System dependent ?! */ #include #include +#include "config.h" + #include "h5core/h5.h" #include "h5_hdf5_private.h" @@ -15,7 +26,7 @@ int h5_initialized = 0; h5_dta_types_t h5_dta_types; // type ids' for base & compound data types int h5_myproc = 0; // proc id - +const char* H5_VER_STRING = PACKAGE_VERSION; /* create several HDF5 types */ diff --git a/src/include/h5core/h5_types.h b/src/include/h5core/h5_types.h index 4811977..6b6ec62 100644 --- a/src/include/h5core/h5_types.h +++ b/src/include/h5core/h5_types.h @@ -51,9 +51,8 @@ extern "C" { #define H5_STRING_T H5T_NATIVE_CHAR #define H5_COMPOUND_T H5T_COMPOUND -#define H5_VER_STRING "2.0.0" - -extern const char * const H5_O_MODES[]; +extern const char* H5_VER_STRING; +extern const char* const H5_O_MODES[]; #ifdef WIN32 typedef __int64 int64_t;