From 4c8e9ca84833a7e6adf610410edd9cc4067dea68 Mon Sep 17 00:00:00 2001
From: James Laird <jlaird@hdfgroup.org>
Date: Thu, 19 Oct 2006 15:10:19 -0500
Subject: [svn-r12787] Fix some references to Variable-length packet table
 functions. For some reason, only Visual Studio DLLs complained about these.

Current code compiles for me under Visual Studio and generates no related
warnings on juniper.
---
 config/craynv         |  9 +++++++++
 hl/test/test_packet.c | 13 +++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/config/craynv b/config/craynv
index e877303..c9b01d6 100644
--- a/config/craynv
+++ b/config/craynv
@@ -17,6 +17,15 @@
 # after configure starts and defines, among other things, flags for
 # the various compile modes.
 
+# Disabling Dependency Tracking
+# ---------------------
+#
+# The Cray X1 machines that THG tests on seem to have trouble doing
+# dependency tracking (probably because they use Cray's C++ compiler,
+# which autoconf may not recognize).  Until this is fixed by autoconf
+# or a user complains, disable dependency tracking on Crays.
+enable_dependency_tracking="no"
+
 # Choosing a C Compiler
 # ---------------------
 #
diff --git a/hl/test/test_packet.c b/hl/test/test_packet.c
index 80d0aff..3445163 100644
--- a/hl/test/test_packet.c
+++ b/hl/test/test_packet.c
@@ -184,8 +184,10 @@ static int test_create_close(hid_t fid)
     H5Tclose(part_t);
     if( H5PTis_valid(table) < 0)
       goto out;
+#ifdef VLPT_REMOVED
     if( H5PTis_varlen(table) != 0)
       goto out;
+#endif /* VLPT_REMOVED */
 
     /* Close the table */
     err = H5PTclose(table);
@@ -218,8 +220,10 @@ static int test_open(hid_t fid)
     table = H5PTopen(fid, PT_NAME);
     if( H5PTis_valid(table) < 0)
       goto out;
+#ifdef VLPT_REMOVED
     if( H5PTis_varlen(table) != 0)
       goto out;
+#endif /* VLPT_REMOVED */
 
     /* Close the table */
     err = H5PTclose(table);
@@ -504,6 +508,7 @@ static int    test_big_table(hid_t fid)
         return -1;
 }
 
+#ifdef VLPT_REMOVED
 /*-------------------------------------------------------------------------
  * test_varlen
  *
@@ -679,6 +684,8 @@ static int    test_varlen(hid_t fid)
     H5E_END_TRY
     return -1;
 }
+#endif /* VLPT_REMOVED */
+
 /*-------------------------------------------------------------------------
  * test_opaque
  *
@@ -925,8 +932,10 @@ static int test_error(hid_t fid)
   H5E_BEGIN_TRY
   if(H5PTis_valid(id) >= 0)
     goto out;
+#ifdef VLPT_REMOVED
   if(H5PTis_varlen(id) >= 0)
     goto out;
+#endif /* VLPT_REMOVED */
   if(H5PTclose(id) >= 0)
     goto out;
   if(H5PTappend(id, (size_t)1, testPart) >= 0)
@@ -950,8 +959,10 @@ static int test_error(hid_t fid)
   H5E_BEGIN_TRY
   if(H5PTis_valid(id) >= 0)
     goto out;
+#ifdef VLPT_REMOVED
   if(H5PTis_varlen(id) >= 0)
     goto out;
+#endif /* VLPT_REMOVED */
   if(H5PTclose(id) >= 0)
     goto out;
   if(H5PTappend(id, (size_t)1, testPart) >= 0)
@@ -980,8 +991,10 @@ static int test_error(hid_t fid)
   H5E_BEGIN_TRY
   if(H5PTis_valid(id) >= 0)
     goto out;
+#ifdef VLPT_REMOVED
   if(H5PTis_varlen(id) >= 0)
     goto out;
+#endif /* VLPT_REMOVED */
   if(H5PTclose(id) >= 0)
     goto out;
   if(H5PTappend(id, (size_t)1, testPart) >= 0)
-- 
cgit v0.12