[svn-r11771] Purpose:

    Code cleanup

Description:
    Fix a bunch of warnings flagged by Windows compilers.


Platforms tested:
    FreeBSD 4.11 (sleipnir)
    Too minor to require h5committest

6 files changed, 6 insertions, 5 deletions

diff --git a/hl/c++/src/H5PacketTable.cpp b/hl/c++/src/H5PacketTable.cpp
index 9718e20..59730e0 100644
--- a/hl/c++/src/H5PacketTable.cpp
+++ b/hl/c++/src/H5PacketTable.cpp
@@ -88,7 +88,7 @@
      * is set to 0 on success.  On failure, returns 0 and
      * error is set to negative.
      */
-    unsigned int PacketTable::GetPacketCount(int& error)
+    hsize_t PacketTable::GetPacketCount(int& error)
     {
         hsize_t npackets;
 
diff --git a/hl/c++/src/H5PacketTable.h b/hl/c++/src/H5PacketTable.h
index 8886deb..518aa23 100644
--- a/hl/c++/src/H5PacketTable.h
+++ b/hl/c++/src/H5PacketTable.h
@@ -75,7 +75,7 @@ public:
      * is set to 0 on success.  On failure, returns 0 and
      * error is set to negative.
      */
-    unsigned int GetPacketCount(int& error);
+    hsize_t GetPacketCount(int& error);
 
     unsigned int GetPacketCount()
     {
diff --git a/hl/fortran/src/H5IMfc.c b/hl/fortran/src/H5IMfc.c
index 822dbe6..b024edc 100755
--- a/hl/fortran/src/H5IMfc.c
+++ b/hl/fortran/src/H5IMfc.c
@@ -15,6 +15,7 @@
 /* This files contains C stubs for H5D Fortran APIs */
 
 #include "H5IM.h"
+#include "H5IMcc.h"
 #include "H5LTf90proto.h"
 #include "../../../fortran/src/H5f90i_gen.h"
 
diff --git a/hl/fortran/src/H5TBfc.c b/hl/fortran/src/H5TBfc.c
index 56515b1..29cf15b 100755
--- a/hl/fortran/src/H5TBfc.c
+++ b/hl/fortran/src/H5TBfc.c
@@ -674,9 +674,9 @@ nh5tbget_field_info_c(hid_t_f *loc_id,
 	/* return values*/
 
 	/* names array */
-	tmp = (char *)malloc(c_lenmax* (hsize_t_f) c_nfields + 1);
+	tmp = (char *)malloc(c_lenmax* (size_t) c_nfields + 1);
 	tmp_p = tmp;
-	memset(tmp,' ', c_lenmax* (hsize_t_f) c_nfields);
+	memset(tmp,' ', c_lenmax* (size_t) c_nfields);
 	tmp[c_lenmax*c_nfields] = '\0';
 	for (i=0; i < c_nfields; i++) {
 		memcpy(tmp_p, c_field_names[i], strlen(c_field_names[i]));
diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c
index 08ac5b8..3ff8ade 100644
--- a/hl/src/H5LT.c
+++ b/hl/src/H5LT.c
@@ -2003,7 +2003,6 @@ hid_t H5LTtext_to_dtype(const char *text)
 {
  extern int yyparse(void);
  hid_t   type_id; 
- hsize_t i;
  
  input_len = strlen(text);
  myinput = strdup(text);
diff --git a/hl/test/test_lite.c b/hl/test/test_lite.c
index 144bfea..7d91267 100644
--- a/hl/test/test_lite.c
+++ b/hl/test/test_lite.c
@@ -13,6 +13,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <stdlib.h>
+#include <string.h>
 
 #include "H5LT.h"