diff options
| author | Ivan Zhakov <ivan@apache.org> | 2019-05-18 19:39:12 +0000 |
|---|---|---|
| committer | Ivan Zhakov <ivan@apache.org> | 2019-05-18 19:39:12 +0000 |
| commit | bba7ae5db7525970b4d24edab977606ba268b9af (patch) | |
| tree | caaea453f7206492a6c3283024ca234849af3f1d | |
| parent | db1fee72187395c87b5a70372a47243d508ec1e2 (diff) | |
| download | apr-bba7ae5db7525970b4d24edab977606ba268b9af.tar.gz | |
win32: Do not use delay load for GetCompressedFileSize() and SetDllDirectoryW()
since there always available on all supported platforms.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1859475 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | include/arch/win32/apr_arch_misc.h | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/include/arch/win32/apr_arch_misc.h b/include/arch/win32/apr_arch_misc.h index b872b6ce5..2cf1c6545 100644 --- a/include/arch/win32/apr_arch_misc.h +++ b/include/arch/win32/apr_arch_misc.h @@ -230,27 +230,6 @@ FARPROC apr_load_dll_func(apr_dlltoken_e fnLib, char *fnName, int ordinal); * these we must always look up */ -#ifdef GetCompressedFileSizeA -#undef GetCompressedFileSizeA -#endif -APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, DWORD, WINAPI, GetCompressedFileSizeA, 0, ( - IN LPCSTR lpFileName, - OUT LPDWORD lpFileSizeHigh), - (lpFileName, lpFileSizeHigh)); -#define GetCompressedFileSizeA apr_winapi_GetCompressedFileSizeA -#undef GetCompressedFileSize -#define GetCompressedFileSize apr_winapi_GetCompressedFileSizeA - -#ifdef GetCompressedFileSizeW -#undef GetCompressedFileSizeW -#endif -APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, DWORD, WINAPI, GetCompressedFileSizeW, 0, ( - IN LPCWSTR lpFileName, - OUT LPDWORD lpFileSizeHigh), - (lpFileName, lpFileSizeHigh)); -#define GetCompressedFileSizeW apr_winapi_GetCompressedFileSizeW - - APR_DECLARE_LATE_DLL_FUNC(DLL_NTDLL, LONG, WINAPI, NtQueryTimerResolution, 0, ( ULONG *pMaxRes, /* Minimum NS Resolution */ ULONG *pMinRes, /* Maximum NS Resolution */ @@ -353,14 +332,6 @@ APR_DECLARE_LATE_DLL_FUNC(DLL_WINSOCK2API, int, WSAAPI, WSAPoll, 0, ( #define WSAPoll apr_winapi_WSAPoll #define HAVE_POLL 1 -#ifdef SetDllDirectoryW -#undef SetDllDirectoryW -#endif -APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, SetDllDirectoryW, 0, ( - IN LPCWSTR lpPathName), - (lpPathName)); -#define SetDllDirectoryW apr_winapi_SetDllDirectoryW - #ifdef if_nametoindex #undef if_nametoindex #endif |