summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2007-04-12 21:41:23 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2007-04-12 21:41:23 (GMT)
commit6151c1cd90aff639f66de06ec419cf49e49581de (patch)
tree2b744bdd17dc108d4bc212238c1df580796c88c4 /src
parentc8f12172f17ee14b024e5367c57fad83183d7ed5 (diff)
downloadhdf5-6151c1cd90aff639f66de06ec419cf49e49581de.zip
hdf5-6151c1cd90aff639f66de06ec419cf49e49581de.tar.gz
hdf5-6151c1cd90aff639f66de06ec419cf49e49581de.tar.bz2
[svn-r13650] Description:
Clean up problems from error handling API changes in parallel and threadsafe builds. Tested on: FreeBSD/64 6.2 (liberty) w/parallel & threadsafe
Diffstat (limited to 'src')
-rw-r--r--src/H5ACpkg.h4
-rw-r--r--src/H5E.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/src/H5ACpkg.h b/src/H5ACpkg.h
index b965a26..973f988 100644
--- a/src/H5ACpkg.h
+++ b/src/H5ACpkg.h
@@ -44,10 +44,6 @@
#include "H5Cpkg.h" /* Cache */
#include "H5SLprivate.h" /* Skip lists */
-#ifdef H5_HAVE_PARALLEL
-#include <mpi.h>
-#endif /* H5_HAVE_PARALLEL */
-
#define H5AC_DEBUG_DIRTY_BYTES_CREATION 0
diff --git a/src/H5E.c b/src/H5E.c
index e20738e..31922a0 100644
--- a/src/H5E.c
+++ b/src/H5E.c
@@ -304,7 +304,7 @@ H5E_term_interface(void)
*
*-------------------------------------------------------------------------
*/
-static H5E_t *
+H5E_t *
H5E_get_stack(void)
{
H5E_t *estack;
@@ -321,7 +321,7 @@ H5E_get_stack(void)
/* Set the thread-specific info */
estack->nused = 0;
estack->new_api = TRUE;
- estack->u.func_stack = (H5E_auto2_t)H5Eprint2;
+ estack->u.func2 = (H5E_auto2_t)H5Eprint2;
estack->auto_data = NULL;
/* (It's not necessary to release this in this API, it is