Mercurial > octave

diff libinterp/corefcn/oct-hdf5.h @ 21032:13b9cac748f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid HDF5 macros if HDF5 is not available * oct-hdf5.h: Don't declare or define anything unless HAVE_HDF5 is defined. * coct-hdf5-types.c, oct-hdf5-types.cc: Don't include oct-hdf5-types.h seperately. * coct-hdf5-types.c: Don't define HDF5 constants unless HAVE_HDF5 is defined.
author John W. Eaton <jwe@octave.org>
date Mon, 04 Jan 2016 00:04:51 -0500
parents ebc439187d29
children e06e600f396a
line wrap: on
line diff
--- a/libinterp/corefcn/oct-hdf5.h	Sun Jan 03 14:22:08 2016 -0800
+++ b/libinterp/corefcn/oct-hdf5.h	Mon Jan 04 00:04:51 2016 -0500
@@ -23,9 +23,11 @@
 #if ! defined (octave_oct_hdf5_h)
 #define octave_hdf5_h 1
 
-#if defined (HAVE_HDF5_H)
+#if defined (HAVE_HDF5)
 
+#if defined (HAVE_HDF5_H)
 #include <hdf5.h>
+#endif
 
 #include "oct-hdf5-types.h"
 
@@ -34,6 +36,7 @@
 #else
 #define H5T_NATIVE_IDX H5T_NATIVE_INT
 #endif
+
 #endif
 
 #endif