summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2004-01-31 02:16:27 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2004-01-31 02:16:27 (GMT)
commit327608ada8874dc9f42433bae3a6e4fd1baef609 (patch)
tree80bd85c5f0c18bc474333772fb7f2f6f64d71315 /src
parent138bc92ebdb7c6e1ad379dcdabae21bf0a79ab0d (diff)
downloadhdf5-327608ada8874dc9f42433bae3a6e4fd1baef609.zip
hdf5-327608ada8874dc9f42433bae3a6e4fd1baef609.tar.gz
hdf5-327608ada8874dc9f42433bae3a6e4fd1baef609.tar.bz2
[svn-r8127] Purpose:
Bug fix Description: Fix a couple of bugaboos in the serial build that crept in Platforms tested: FreeBSD 4.9 (sleipnir) too minor to require h5committest
Diffstat (limited to 'src')
-rw-r--r--src/H5.c2
-rw-r--r--src/H5D.c4
-rw-r--r--src/H5FDmpi.h12
3 files changed, 13 insertions, 5 deletions
diff --git a/src/H5.c b/src/H5.c
index 712e6c6..4e8556d 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -1749,6 +1749,7 @@ H5_trace (const double *returning, const char *func, const char *type, ...)
}
break;
+#ifdef H5_HAVE_PARALLEL
case 't':
if (ptr) {
if (vp) {
@@ -1771,6 +1772,7 @@ H5_trace (const double *returning, const char *func, const char *type, ...)
}
}
break;
+#endif /* H5_HAVE_PARALLEL */
default:
fprintf (out, "BADTYPE(D%c)", type[1]);
diff --git a/src/H5D.c b/src/H5D.c
index 812979c..95801fb 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -157,7 +157,9 @@ H5D_init_interface(void)
hid_t def_vfl_id = H5D_XFER_VFL_ID_DEF;
void *def_vfl_info = H5D_XFER_VFL_INFO_DEF;
size_t def_hyp_vec_size = H5D_XFER_HYPER_VECTOR_SIZE_DEF;
+#ifdef H5_HAVE_PARALLEL
H5FD_mpio_xfer_t def_io_xfer_mode = H5D_XFER_IO_XFER_MODE_DEF;
+#endif /* H5_HAVE_PARALLEL */
H5Z_EDC_t enable_edc = H5D_XFER_EDC_DEF;
H5Z_cb_t filter_cb = H5D_XFER_FILTER_CB_DEF;
@@ -252,9 +254,11 @@ H5D_init_interface(void)
if(H5P_register(xfer_pclass,H5D_XFER_HYPER_VECTOR_SIZE_NAME,H5D_XFER_HYPER_VECTOR_SIZE_SIZE,&def_hyp_vec_size,NULL,NULL,NULL,NULL,NULL,NULL,NULL)<0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
+#ifdef H5_HAVE_PARALLEL
/* Register the I/O transfer mode property */
if(H5P_register(xfer_pclass,H5D_XFER_IO_XFER_MODE_NAME,H5D_XFER_IO_XFER_MODE_SIZE,&def_io_xfer_mode,NULL,NULL,NULL,NULL,NULL,NULL,NULL)<0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
+#endif /* H5_HAVE_PARALLEL */
/* Register the EDC property */
if(H5P_register(xfer_pclass,H5D_XFER_EDC_NAME,H5D_XFER_EDC_SIZE,&enable_edc,NULL,NULL,NULL,NULL,NULL,NULL,NULL)<0)
diff --git a/src/H5FDmpi.h b/src/H5FDmpi.h
index 0de063a..f7e0200 100644
--- a/src/H5FDmpi.h
+++ b/src/H5FDmpi.h
@@ -36,23 +36,20 @@ typedef struct H5FD_class_mpi_t {
int (*get_size)(const H5FD_t *file); /* Get the MPI size of a communicator */
MPI_Comm (*get_comm)(const H5FD_t *file); /* Get the communicator for a file */
} H5FD_class_mpi_t;
+#endif /* H5_HAVE_PARALLEL */
/* Include all the MPI VFL headers */
#include "H5FDfphdf5.h" /* Flexible PHDF5 file driver */
#include "H5FDmpio.h" /* MPI I/O file driver */
#include "H5FDmpiposix.h" /* MPI/posix I/O file driver */
-/*
- * The view is set to this value
- */
-extern char H5FD_mpi_native_g[];
-
/* Macros */
/* Single macro to check for all file drivers that use MPI */
#define IS_H5FD_MPI(file) \
(IS_H5FD_MPIO(file) || IS_H5FD_MPIPOSIX(file) || IS_H5FD_FPHDF5(file))
+#ifdef H5_HAVE_PARALLEL
/* ======== Temporary data transfer properties ======== */
/* Definitions for memory MPI type property */
#define H5FD_MPI_XFER_MEM_MPI_TYPE_NAME "H5FD_mpi_mem_mpi_type"
@@ -61,6 +58,11 @@ extern char H5FD_mpi_native_g[];
#define H5FD_MPI_XFER_FILE_MPI_TYPE_NAME "H5FD_mpi_file_mpi_type"
#define H5FD_MPI_XFER_FILE_MPI_TYPE_SIZE sizeof(MPI_Datatype)
+/*
+ * The view is set to this value
+ */
+extern char H5FD_mpi_native_g[];
+
/* Function prototypes */
#ifdef __cplusplus
extern "C" {