wrowe 02/01/29 19:12:38
Modified: misc/win32 misc.c
include/arch/win32 misc.h
Log:
A some-platforms-symbol required for apr_app.c
Revision Changes Path
1.9 +2 -2 apr/misc/win32/misc.c
Index: misc.c
===================================================================
RCS file: /home/cvs/apr/misc/win32/misc.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- misc.c 28 Jan 2002 15:56:08 -0000 1.8
+++ misc.c 30 Jan 2002 03:12:38 -0000 1.9
@@ -180,9 +180,9 @@
*/
static const char* const lateDllName[DLL_defined] = {
- "kernel32", "advapi32", "mswsock", "ws2_32" };
+ "kernel32", "advapi32", "mswsock", "ws2_32", "shell32" };
static HMODULE lateDllHandle[DLL_defined] = {
- NULL, NULL, NULL, NULL };
+ NULL, NULL, NULL, NULL, NULL };
FARPROC apr_load_dll_func(apr_dlltoken_e fnLib, char* fnName, int ordinal)
{
1.39 +8 -1 apr/include/arch/win32/misc.h
Index: misc.h
===================================================================
RCS file: /home/cvs/apr/include/arch/win32/misc.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- misc.h 29 Jan 2002 07:24:10 -0000 1.38
+++ misc.h 30 Jan 2002 03:12:38 -0000 1.39
@@ -171,7 +171,8 @@
DLL_WINADVAPI = 1, // advapi32 From WinBase.h
DLL_WINSOCKAPI = 2, // mswsock From WinSock.h
DLL_WINSOCK2API = 3, // ws2_32 From WinSock2.h
- DLL_defined = 4 // must define as last idx_ + 1
+ DLL_SHSTDAPI = 4, // shell32 From ShellAPI.h
+ DLL_defined = 5 // must define as last idx_ + 1
} apr_dlltoken_e;
FARPROC apr_load_dll_func(apr_dlltoken_e fnLib, char *fnName, int ordinal);
@@ -292,6 +293,12 @@
(handle, ObjectType, SecurityInfo, ppsidOwner, ppsidGroup,
ppDacl, ppSacl, ppSecurityDescriptor));
#define GetSecurityInfo apr_winapi_GetSecurityInfo
+
+APR_DECLARE_LATE_DLL_FUNC(DLL_SHSTDAPI, LPWSTR *, WINAPI,
CommandLineToArgvW, 0, (
+ LPCWSTR lpCmdLine,
+ int *pNumArgs),
+ (lpCmdLine, pNumArgs));
+#define CommandLineToArgvW apr_winapi_CommandLineToArgvW
#endif /* !defined(_WIN32_WCE) && !defined(WINNT) */
