mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-12-27 08:01:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r23368] Correct names and add includes for windows

Browse Source
This commit is contained in:
Allen Byrne 2013-03-18 15:44:02 -05:00
parent ebfebfd7d5
commit 23635d656a
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/H5PL.c
View File

@ -286,7 +286,6 @@ H5PL_find(H5PL_type_t plugin_type, int type_id, char *dir, void **info)
{ {
char *pathname = NULL; char *pathname = NULL;
struct dirent *dp = NULL; struct dirent *dp = NULL;
struct stat my_stat;
WIN32_FIND_DATA fdFile; WIN32_FIND_DATA fdFile;
HANDLE hFind = NULL; HANDLE hFind = NULL;
@ -375,7 +374,7 @@ H5PL_open(H5PL_type_t pl_type, char *libname, int pl_id, void **pl_info)
/*fprintf(stderr, "not open dl library: %s\n", H5PL_CLR_ERR);*/ /*fprintf(stderr, "not open dl library: %s\n", H5PL_CLR_ERR);*/
HGOTO_DONE(ret_value) HGOTO_DONE(ret_value)
H5PL_CLR_ERR; /*clear error*/ H5PL_CLR_ERROR; /*clear error*/
/* Return a handle for the function H5PL_get_plugin_info in the dynamic library. /* Return a handle for the function H5PL_get_plugin_info in the dynamic library.
* The plugin library is suppose to define this function. */ * The plugin library is suppose to define this function. */
@ -448,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++) { 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((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"))) 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: %s", H5PL_CLR_ERR) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "can't get function: %s", H5PL_CLR_ERROR)
if(NULL == (plugin_info = (*H5PL_get_plugin_info)())) if(NULL == (plugin_info = (*H5PL_get_plugin_info)()))
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "can't get plugin info") HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "can't get plugin info")

2
src/H5PLpkg.h
View File

@ -48,7 +48,7 @@
#define H5PL_ERROR DWORD dw; char *error #define H5PL_ERROR DWORD dw; char *error
/* Clear error - nothing to do */ /* Clear error - nothing to do */
#define H5PLG_CLR_ERROR #define H5PL_CLR_ERROR
/* Print error message */ /* Print error message */
#define H5PL_CHECK_ERR(R) { \ #define H5PL_CHECK_ERR(R) { \

13
src/H5PLprivate.h
View File

@ -26,6 +26,19 @@
/* Private headers needed by this file */ /* Private headers needed by this file */
#include "H5private.h" /* Generic Functions */ #include "H5private.h" /* Generic Functions */
#ifdef H5_HAVE_WIN32_API
/* The following two defines must be before any windows headers are included */
#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */
#define NOGDI /* Exclude Graphic Display Interface macros */
#ifdef H5_HAVE_WINSOCK2_H
#include <winsock2.h>
#endif
#include <windows.h>
#endif /*H5_HAVE_WIN32_API*/
#ifdef H5_HAVE_DLFCN_H #ifdef H5_HAVE_DLFCN_H
#include <dlfcn.h> #include <dlfcn.h>
#endif #endif