apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r543368 - /apr/apr/trunk/misc/win32/start.c
Date Fri, 01 Jun 2007 02:42:32 GMT
Author: wrowe
Date: Thu May 31 19:42:31 2007
New Revision: 543368

URL: http://svn.apache.org/viewvc?view=rev&rev=543368
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/trunk/misc/win32/start.c

Modified: apr/apr/trunk/misc/win32/start.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/misc/win32/start.c?view=diff&rev=543368&r1=543367&r2=543368
==============================================================================
--- apr/apr/trunk/misc/win32/start.c (original)
+++ apr/apr/trunk/misc/win32/start.c Thu May 31 19:42:31 2007
@@ -29,6 +29,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
@@ -86,6 +87,7 @@
     *retarr = newarr;
     return args;
 }
+#endif
 
 /* Reprocess the arguments to main() for a completely apr-ized application
  */
@@ -100,7 +102,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;



Mime
View raw message