You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2007/06/01 04:42:43 UTC
svn commit: r543369 - /apr/apr/branches/1.2.x/misc/win32/start.c
Author: wrowe
Date: Thu May 31 19:42:42 2007
New Revision: 543369
URL: http://svn.apache.org/viewvc?view=rev&rev=543369
Log:
apr_app_initialize performs manipulation of environment variables (in particular
converting them from Unicode to char*) whereas WinCE has no enviroment - and also
updates the argv array by parsing the Unicode command line which uses the
CommandLineToArgvW method which not available on WinCE. Suppress both on WinCE.
PR: 39892
Submitted by: Curt Arnold <carnold apache.org>
Reviewed by: Davi Arnaut
Forward port: 543367
Modified:
apr/apr/branches/1.2.x/misc/win32/start.c
Modified: apr/apr/branches/1.2.x/misc/win32/start.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/misc/win32/start.c?view=diff&rev=543369&r1=543368&r2=543369
==============================================================================
--- apr/apr/branches/1.2.x/misc/win32/start.c (original)
+++ apr/apr/branches/1.2.x/misc/win32/start.c Thu May 31 19:42:42 2007
@@ -30,6 +30,7 @@
*/
int APR_DECLARE_DATA apr_app_init_complete = 0;
+#if !defined(_WIN32_WCE)
/* Used by apr_app_initialize to reprocess the environment
*
* An internal apr function to convert a double-null terminated set
@@ -87,6 +88,7 @@
*retarr = newarr;
return args;
}
+#endif
/* Reprocess the arguments to main() for a completely apr-ized application
*/
@@ -101,7 +103,9 @@
return rv;
}
-#if APR_HAS_UNICODE_FS
+#if defined(_WIN32_WCE)
+ apr_app_init_complete = 1;
+#elif APR_HAS_UNICODE_FS
IF_WIN_OS_IS_UNICODE
{
apr_wchar_t **wstrs;