From 91435585936c2637947c132489599c76932d77e4 Mon Sep 17 00:00:00 2001
From: Quincey Koziol <koziol@hdfgroup.org>
Date: Fri, 15 Apr 2011 14:47:30 -0500
Subject: [svn-r20518] Description: 	Correct test file name.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, w/threadsafe, in production mode
        Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
---
 config/freebsd               | 18 ------------------
 tools/h5dump/h5dumpgentest.c | 17 ++++++++++++-----
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/config/freebsd b/config/freebsd
index 7452ff0..e42ca60 100644
--- a/config/freebsd
+++ b/config/freebsd
@@ -26,13 +26,6 @@ if test "X-" = "X-$CC"; then
   CC_BASENAME=gcc
 fi
 
-# Add "_XOPEN_SOURCE" define to cpp flags, to quiet warnings
-#       from /usr/include/sys/cdefs.h
-# (Unless we are using g++ as a C compiler)
-if test "X-g++" != "X-$CC"; then
-    H5_CPPFLAGS="$H5_CPPFLAGS -D_XOPEN_SOURCE=600" 
-fi
-
 # Figure out C compiler flags
 . $srcdir/config/gnu-flags
 
@@ -63,14 +56,3 @@ fi
 # Figure out Intel F90 compiler flags
 . $srcdir/config/intel-fflags
 
-# Special setup to use pthread support if enable-threadsafe is on.
-# Works with static executable only.
-if test "X-" != "X-$enable_threadsafe"; then
-  H5_CFLAGS="$H5_CFLAGS -D_THREAD_SAFE" 
-  H5_CXXFLAGS="$H5_CXXFLAGS -D_THREAD_SAFE" 
-  AM_LDFLAGS="$AM_LDFLAGS -pthread"
-fi
-
-# Temporarily hard set this variable.  The problem of loss of the last 2 bytes of mantissa
-# turns out to be elusive.  Hard set it until a better solution is found. 
-hdf5_cv_ullong_to_ldouble_precision_works=${hdf5_cv_ullong_to_ldouble_precision_works='no'}
diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c
index e62e211..848006e 100644
--- a/tools/h5dump/h5dumpgentest.c
+++ b/tools/h5dump/h5dumpgentest.c
@@ -2815,7 +2815,7 @@ static void gent_vldatatypes5(void)
 
 static void gent_array1_big(void)
 {
-    int wdata[SPACE_ARRAY1BIG_DIM][ARRAY1BIG_DIM];   /* Information to write */
+    int *wdata;   /* Information to write */
     hid_t  fid1;  /* HDF5 File IDs  */
     hid_t  dataset; /* Dataset ID   */
     hid_t  sid1;       /* Dataspace ID   */
@@ -2835,24 +2835,27 @@ static void gent_array1_big(void)
     hsize_t  count[SPACE1_RANK];     /* Element count of hyperslab */
     hsize_t  block[SPACE1_RANK];     /* Block size of hyperslab */
     hdset_reg_ref_t   *wbuf;         /* buffer to write to disk */
+
     start[0] = 0;
     stride[0] = 1;
     count[0] = 999;
     block[0] = 1;
+
     /* Allocate write & read buffers */
     wbuf = (hdset_reg_ref_t*) calloc(sizeof(hdset_reg_ref_t), SPACE1_DIM1);
+    wdata = (int *)malloc(sizeof(int) * (size_t)(SPACE_ARRAY1BIG_DIM * ARRAY1BIG_DIM));
 
     /* Allocate and initialize array data to write */
-    for(i=0; i<SPACE_ARRAY1BIG_DIM; i++)
-        for(j=0; j<ARRAY1BIG_DIM; j++)
-            wdata[i][j]=i*1;
+    for(i = 0; i < SPACE_ARRAY1BIG_DIM; i++)
+        for(j = 0; j < ARRAY1BIG_DIM; j++)
+            *(wdata + (i * ARRAY1BIG_DIM) + j) = i * 1;
 
     /* Create file */
     fid1 = H5Fcreate(FILE25_BIG, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
     /*-------------------------
      * Array type dataset 
-     *
+     */
     /* Create dataspace for datasets */
     sid1 = H5Screate_simple(SPACE1_RANK, sdims1, NULL);
 
@@ -2895,6 +2898,10 @@ static void gent_array1_big(void)
     assert(ret >= 0);
     ret = H5Fclose(fid1);
     assert(ret >= 0);
+
+    /* Release memory */
+    free(wbuf);
+    free(wdata);
 }
 
 static void gent_array1(void)
-- 
cgit v0.12