File tree Expand file tree Collapse file tree 2 files changed +9
-0
lines changed Expand file tree Collapse file tree 2 files changed +9
-0
lines changed Original file line number Diff line number Diff line change @@ -36,6 +36,7 @@ void *dlopen(const char *module_name, int mode)
36
36
* same path or can be found in the usual places. Failing that, let's
37
37
* let that dso look in the apache root.
38
38
*/
39
+ #if !defined(WINAPI_FAMILY ) || (WINAPI_FAMILY != WINAPI_FAMILY_APP )
39
40
em = SetErrorMode (SEM_FAILCRITICALERRORS );
40
41
dsoh = LoadLibraryExA (path , NULL , LOAD_WITH_ALTERED_SEARCH_PATH );
41
42
if (!dsoh )
@@ -45,6 +46,11 @@ void *dlopen(const char *module_name, int mode)
45
46
}
46
47
SetErrorMode (em );
47
48
SetLastError (0 ); // clear the last error
49
+ #else
50
+ wchar_t pathW [MAX_PATH ];
51
+ mbstowcs (pathW , path , MAX_PATH );
52
+ dsoh = LoadPackagedLibrary (pathW , 0 );
53
+ #endif
48
54
return (void * )dsoh ;
49
55
}
50
56
Original file line number Diff line number Diff line change 29
29
#include <stdio.h> /* fprintf */
30
30
#include <errno.h> /* errno, EIN* */
31
31
#include <string.h> /* memcpy, strlen */
32
+ #if HAVE_UNISTD_H
32
33
#include <unistd.h> /* pclose */
34
+ #endif
33
35
#include <limits.h> /* PATH_MAX */
34
36
#include <dirent.h> /* opendir, readdir */
35
37
#include <ctype.h> /* isalpha */
61
63
#if defined(_WIN32 )
62
64
# include <windows.h>
63
65
# include "msvc/contrib/win32_cs.h"
66
+ # include <winsock2.h>
64
67
# define strcasecmp _stricmp
65
68
# define strncasecmp _strnicmp
66
69
#endif
You can’t perform that action at this time.
0 commit comments