summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorVailin Choi <vchoi@hdfgroup.org>2013-10-15 19:16:05 (GMT)
committerVailin Choi <vchoi@hdfgroup.org>2013-10-15 19:16:05 (GMT)
commit308880e894e4efa447b4f714ce75376c456abafa (patch)
tree6e42a34bdc6fb9e73b36af784cd9d0c8e67115ec /hl
parentfebb17322b3082e2f4f731a3fb24adf0d54dbea1 (diff)
downloadhdf5-308880e894e4efa447b4f714ce75376c456abafa.zip
hdf5-308880e894e4efa447b4f714ce75376c456abafa.tar.gz
hdf5-308880e894e4efa447b4f714ce75376c456abafa.tar.bz2
[svn-r24293] Bring revisions #24058 - #24098 from trunk to revise_chunks.
h5committested.
Diffstat (limited to 'hl')
-rw-r--r--hl/c++/src/Makefile.in2
-rw-r--r--hl/fortran/src/Makefile.in2
-rw-r--r--hl/src/H5HLprivate2.h1
-rw-r--r--hl/src/Makefile.in2
-rw-r--r--hl/tools/h5watch/h5watch.c2
5 files changed, 5 insertions, 4 deletions
diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index 369ccc2..102fe39 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@@ -458,7 +458,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
# Add libtool shared library version numbers to the HDF5 library
# See libtool versioning documentation online.
LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 152
+LT_VERS_REVISION = 154
LT_VERS_AGE = 0
# Include src directory
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index 85e4757..c69b952 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -474,7 +474,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
# Add libtool shared library version numbers to the HDF5 library
# See libtool versioning documentation online.
LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 152
+LT_VERS_REVISION = 154
LT_VERS_AGE = 0
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_builddir)/hl/src \
-I$(top_srcdir)/fortran/src -I$(top_builddir)/fortran/src
diff --git a/hl/src/H5HLprivate2.h b/hl/src/H5HLprivate2.h
index 7480bd8..5646d6c 100644
--- a/hl/src/H5HLprivate2.h
+++ b/hl/src/H5HLprivate2.h
@@ -66,6 +66,7 @@
#ifndef HDrealloc
#define HDrealloc(M,Z) realloc(M,Z)
#endif /* HDrealloc */
+H5_DLL int HDfprintf (FILE *stream, const char *fmt, ...);
#ifndef HDfree
#define HDfree(M) free(M)
#endif /* HDfree */
diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in
index 466449c..a796bd1 100644
--- a/hl/src/Makefile.in
+++ b/hl/src/Makefile.in
@@ -457,7 +457,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
# Add libtool shared library version numbers to the HDF5 library
# See libtool versioning documentation online.
LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 152
+LT_VERS_REVISION = 154
LT_VERS_AGE = 0
# This library is our main target.
diff --git a/hl/tools/h5watch/h5watch.c b/hl/tools/h5watch/h5watch.c
index 7cf8ff6..2324300 100644
--- a/hl/tools/h5watch/h5watch.c
+++ b/hl/tools/h5watch/h5watch.c
@@ -20,6 +20,7 @@
#include <float.h>
#include "h5tools.h"
+#include "h5tools_dump.h"
#include "h5tools_utils.h"
#include "h5tools_ref.h"
#include "h5trav.h"
@@ -313,7 +314,6 @@ done:
static herr_t
monitor_dataset(hid_t fid, char *dsetname)
{
- char drivername[50];/* Driver's name for opening the file */
hid_t did; /* dataset id */
hid_t sid; /* dataspace id */
int ndims; /* # of dimensions in the dataspace */