[svn-r16674] #1105 (B1) The v16 default api in HDF5 1.8.0 has problems w/High Level library.

ISSUE: the header files changed names between 1.6 and 1.8, and that may cause issues for a 1.6 app using the 1.8 library. 
SOLUTION: Added a conditional #if def to detect 1.6 library version number and use the 1.6 headers or else use the 1.8 headers.
DOCS AND TEST: Nothing added
STATUS:  Closed bug

tested: linux

8 files changed, 50 insertions, 12 deletions

diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c
index 9fbd066..dc2b67c 100644
--- a/hl/src/H5IM.c
+++ b/hl/src/H5IM.c
@@ -13,10 +13,15 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include "H5IM.h"
-
 #include <string.h>
 #include <stdlib.h>
+#include "hdf5.h"
+#if H5_VERS_MAJOR == 1 && H5_VERS_MINOR == 6
+#include "H5IM.h"
+#include "H5LT.h"
+#else
+#include <hdf5_hl.h>
+#endif
 
 
 /*-------------------------------------------------------------------------
diff --git a/hl/src/H5IM.h b/hl/src/H5IM.h
index e32550b..ec71949 100644
--- a/hl/src/H5IM.h
+++ b/hl/src/H5IM.h
@@ -16,7 +16,14 @@
 #ifndef _H5IM_H
 #define _H5IM_H
 
+#include "hdf5.h"
+
+#if H5_VERS_MAJOR == 1 && H5_VERS_MINOR == 6
 #include "H5LT.h"
+#else
+#include <hdf5_hl.h>
+#endif
+
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c
index a88a524..418a3ef 100644
--- a/hl/src/H5LT.c
+++ b/hl/src/H5LT.c
@@ -13,9 +13,14 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include "H5LT.h"
 #include <string.h>
 #include <stdlib.h>
+#include "hdf5.h"
+#if H5_VERS_MAJOR == 1 && H5_VERS_MINOR == 6
+#include "H5LT.h"
+#else
+#include <hdf5_hl.h>
+#endif
 
 /*-------------------------------------------------------------------------
  *
diff --git a/hl/src/H5TA.c b/hl/src/H5TA.c
index 49f49de..31c8e5c 100644
--- a/hl/src/H5TA.c
+++ b/hl/src/H5TA.c
@@ -13,11 +13,15 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include "H5TA.h"
 #include <stdlib.h>
 #include <string.h>
-
-
+#include "hdf5.h"
+#if H5_VERS_MAJOR == 1 && H5_VERS_MINOR == 6
+#include "H5TA.h"
+#include "H5LT.h"
+#else
+#include <hdf5_hl.h>
+#endif
 
 /*-------------------------------------------------------------------------
  *
diff --git a/hl/src/H5TA.h b/hl/src/H5TA.h
index f6e635c..8baa57c 100644
--- a/hl/src/H5TA.h
+++ b/hl/src/H5TA.h
@@ -16,11 +16,13 @@
 #ifndef _H5TB_H
 #define _H5TB_H
 
-#if 0
-#define H5_TB_DEBUG
-#endif
+#include "hdf5.h"
 
+#if H5_VERS_MAJOR == 1 && H5_VERS_MINOR == 6
 #include "H5LT.h"
+#else
+#include <hdf5_hl.h>
+#endif
 
 #define TABLE_CLASS         "TABLE"
 #define TABLE_VERSION       "3.0"
diff --git a/hl/test/test_image.c b/hl/test/test_image.c
index 9c29118..2cfe01c 100644
--- a/hl/test/test_image.c
+++ b/hl/test/test_image.c
@@ -13,8 +13,13 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
+#include "hdf5.h"
 
+#if H5_VERS_MAJOR == 1 && H5_VERS_MINOR == 6
 #include "H5IM.h"
+#else
+#include <hdf5_hl.h>
+#endif
 
 #define FILE_NAME "test_image.h5"
 
diff --git a/hl/test/test_lite.c b/hl/test/test_lite.c
index 66dd7f0..76b81fd 100644
--- a/hl/test/test_lite.c
+++ b/hl/test/test_lite.c
@@ -14,9 +14,13 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <stdlib.h>
-
-
+#include <string.h>
+#include "hdf5.h"
+#if H5_VERS_MAJOR == 1 && H5_VERS_MINOR == 6
 #include "H5LT.h"
+#else
+#include <hdf5_hl.h>
+#endif
 
 
 #define FILE_NAME "test_lite1.h5"
diff --git a/hl/test/test_table.c b/hl/test/test_table.c
index 5e12ad8..736c3d9 100644
--- a/hl/test/test_table.c
+++ b/hl/test/test_table.c
@@ -13,11 +13,17 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include "H5TA.h"
+
 
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
+#include "hdf5.h"
+#if H5_VERS_MAJOR == 1 && H5_VERS_MINOR == 6
+#include "H5TA.h"
+#else
+#include <hdf5_hl.h>
+#endif
 
 #define TEST_FILE_BE "test_table_be.hdf5"
 #define TEST_FILE_LE "test_table_le.hdf5"