summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Lu <songyulu@hdfgroup.org>2013-03-18 22:16:59 (GMT)
committerRaymond Lu <songyulu@hdfgroup.org>2013-03-18 22:16:59 (GMT)
commitc08dc5f646ca7e074d6ed89824658fb9842eda19 (patch)
treee0b0a7c67efcf6fb877c2ef4bf3769e9cc210bd3
parente4c9a6f3b61387368d69e1a676d9cacea2a42321 (diff)
downloadhdf5-c08dc5f646ca7e074d6ed89824658fb9842eda19.zip
hdf5-c08dc5f646ca7e074d6ed89824658fb9842eda19.tar.gz
hdf5-c08dc5f646ca7e074d6ed89824658fb9842eda19.tar.bz2
[svn-r23373] Some updates for Windows.
Not tested.
-rw-r--r--src/H5PL.c6
-rw-r--r--src/H5PLprivate.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/H5PL.c b/src/H5PL.c
index 6fcf7eb..4d18926 100644
--- a/src/H5PL.c
+++ b/src/H5PL.c
@@ -371,10 +371,10 @@ H5PL_open(H5PL_type_t pl_type, char *libname, int pl_id, void **pl_info)
/* There are different reasons why a library can't be open, e.g. wrong architecture.
* simply continue if we can't open it */
if(NULL == (handle = H5PL_OPEN_DLIB(libname)))
- /*fprintf(stderr, "not open dl library: %s\n", H5PL_CLR_ERR);*/
+ /*fprintf(stderr, "not open dl library: %s\n", H5PL_CLR_ERROR);*/
HGOTO_DONE(ret_value)
- H5PL_CLR_ERROR; /*clear error*/
+ H5PL_CLR_ERROR; /*clear error*/
/* Return a handle for the function H5PL_get_plugin_info in the dynamic library.
* The plugin library is suppose to define this function. */
@@ -447,7 +447,7 @@ fprintf(stderr, "%s: H5PL_table_used_g=%d, id=%d\n", FUNC, H5PL_table_used_g, (H
for(i=0; i<H5PL_table_used_g; i++) {
if((plugin_type == (H5PL_table_g[i]).pl_type) && (type_id == (H5PL_table_g[i]).pl_id)) {
if(NULL == (H5PL_get_plugin_info = H5PL_GET_LIB_FUNC((H5PL_table_g[i]).handle, "H5PL_get_plugin_info")))
- HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "can't get function: H5PL_GET_LIB_FUNC")
+ HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "can't get function for H5PL_get_plugin_info")
if(NULL == (plugin_info = (*H5PL_get_plugin_info)()))
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "can't get plugin info")
diff --git a/src/H5PLprivate.h b/src/H5PLprivate.h
index 7d363da..61cfcda 100644
--- a/src/H5PLprivate.h
+++ b/src/H5PLprivate.h
@@ -36,7 +36,7 @@
#endif
#include <windows.h>
-
+#include <direct.h> /* For _getcwd() */
#endif /*H5_HAVE_WIN32_API*/
#ifdef H5_HAVE_DLFCN_H