diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2007-06-01 02:42:42 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2007-06-01 02:42:42 +0000 |
| commit | 44829cc58095b6eccbdec6f69df653ec0e262781 (patch) | |
| tree | 63223fea91aa6eec2220a83809d8328d807a6e48 | |
| parent | 39eb7b35c396cfda69c9286343e1a1819d48edbc (diff) | |
| download | libapr-44829cc58095b6eccbdec6f69df653ec0e262781.tar.gz | |
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
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.2.x@543369 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | misc/win32/start.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/misc/win32/start.c b/misc/win32/start.c index f51b749d2..b7297768a 100644 --- a/misc/win32/start.c +++ b/misc/win32/start.c @@ -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 @@ static int warrsztoastr(const char * const * *retarr, *retarr = newarr; return args; } +#endif /* Reprocess the arguments to main() for a completely apr-ized application */ @@ -101,7 +103,9 @@ APR_DECLARE(apr_status_t) apr_app_initialize(int *argc, 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; |