[SCM] hdf5 branch, master, updated. upstream/1.8.7-165-gc52b044

[Sylvestre Ledru]

The following commit has been merged in the master branch:
commit 101c2671db75c0017040f0d33788e54b422493dd
Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
Date:   Tue Jul 2 16:38:27 2013 +0200

    match upstream tarball

diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index c5a24c4..4e8a88d 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -8597,6 +8597,7 @@ H5T__conv_float_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  *-------------------------------------------------------------------------
  */
+#if H5T_CONV_INTERNAL_FP_ULLONG
 herr_t
 H5T__conv_float_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 		       size_t nelmts, size_t buf_stride,
@@ -8605,6 +8606,7 @@ H5T__conv_float_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 {
     H5T_CONV_Fx(FLOAT, ULLONG, float, unsigned long long, 0, ULLONG_MAX);
 }
+#endif /*H5T_CONV_INTERNAL_FP_ULLONG*/
 
 

 /*-------------------------------------------------------------------------
@@ -8649,6 +8651,7 @@ H5T__conv_double_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  *-------------------------------------------------------------------------
  */
+#if H5T_CONV_INTERNAL_FP_ULLONG
 herr_t
 H5T__conv_double_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 		       size_t nelmts, size_t buf_stride,
@@ -8657,6 +8660,7 @@ H5T__conv_double_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 {
     H5T_CONV_Fx(DOUBLE, ULLONG, double, unsigned long long, 0, ULLONG_MAX);
 }
+#endif /*H5T_CONV_INTERNAL_FP_ULLONG*/
 
 

 /*-------------------------------------------------------------------------
@@ -8701,6 +8705,7 @@ H5T__conv_ldouble_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  *-------------------------------------------------------------------------
  */
+#if H5T_CONV_INTERNAL_LDOUBLE_ULLONG
 herr_t
 H5T__conv_ldouble_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 		       size_t nelmts, size_t buf_stride,
@@ -8709,6 +8714,7 @@ H5T__conv_ldouble_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 {
     H5T_CONV_Fx(LDOUBLE, ULLONG, long double, unsigned long long, 0, ULLONG_MAX);
 }
+#endif /*H5T_CONV_INTERNAL_LDOUBLE_ULLONG*/
 
 

 /*-------------------------------------------------------------------------
diff --git a/src/H5public.h b/src/H5public.h
index 3f0624c..b022ca7 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -59,6 +59,9 @@
 #endif
 #ifdef H5_HAVE_PARALLEL
 #   include <mpi.h>
+#ifndef MPI_FILE_NULL		/*MPIO may be defined in mpi.h already       */
+#   include <mpio.h>
+#endif
 #endif
 
 
diff --git a/testpar/t_cache.c b/testpar/t_cache.c
index 6a4893a..234df01 100644
--- a/testpar/t_cache.c
+++ b/testpar/t_cache.c
@@ -35,10 +35,6 @@
 
 #include "H5Fpkg.h"
 
-#ifndef PATH_MAX
-#define PATH_MAX    512
-#endif  /* !PATH_MAX */
-
 
 int     	nerrors = 0;
 int		failures = 0;

-- 
Hierarchical Data Format 5 (HDF5)