[svn-r24301] merge from trunk.

resolve conflicts, etc...

5 files changed, 10 insertions, 7 deletions

diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index 39daa9a..850339c 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@@ -460,7 +460,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 = 155
+LT_VERS_REVISION = 157
 LT_VERS_AGE = 0
 
 # Include src directory
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index 577c524..89ed0ff 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -476,7 +476,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 = 155
+LT_VERS_REVISION = 157
 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/H5LTanalyze.c b/hl/src/H5LTanalyze.c
index f02bed6..c3e5d73 100644
--- a/hl/src/H5LTanalyze.c
+++ b/hl/src/H5LTanalyze.c
@@ -14,9 +14,11 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * This file was generated by Lex with the command "lex -PH5LTyy -oH5LTanalyze.c H5LTanalyze.l".
- * Do NOT modify it by hand, but in line 52, "#ifdef H5_HAVE_UNISTD_H" should be added if
- * the platform doesn't have the unistd.h header file.
+ * This file was generated by Lex with the command "lex -PH5LTyy
+ * -oH5LTanalyze.c H5LTanalyze.l".  Do NOT modify it by hand, but in
+ * line 52, "#ifdef H5_HAVE_UNISTD_H" should be added if the platform
+ * doesn't have the unistd.h header file. Also hdf5.h should be added
+ * before adding H5_HAVE_UNISTD_H.
  */
 
 #define yy_create_buffer H5LTyy_create_buffer
@@ -49,6 +51,7 @@
 #define YY_FLEX_MINOR_VERSION 5
 
 #include <stdio.h>
+#include <hdf5.h>
 #ifdef H5_HAVE_UNISTD_H
 #include <unistd.h>
 #endif 
diff --git a/hl/src/H5PT.c b/hl/src/H5PT.c
index ff4347a..92b041a 100644
--- a/hl/src/H5PT.c
+++ b/hl/src/H5PT.c
@@ -371,7 +371,7 @@ herr_t H5PTclose( hid_t table_id )
   htbl_t * table;
 
   /* Remove the ID from the library */
-  if((table = H5Iremove_verify(table_id, H5PT_ptable_id_type)) ==NULL)
+  if((table = (htbl_t *)H5Iremove_verify(table_id, H5PT_ptable_id_type)) ==NULL)
     goto out;
 
   /* If the library found the table, remove it */
diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in
index ddf684a..1f15188 100644
--- a/hl/src/Makefile.in
+++ b/hl/src/Makefile.in
@@ -459,7 +459,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 = 155
+LT_VERS_REVISION = 157
 LT_VERS_AGE = 0
 
 # This library is our main target.