View | Details | Raw Unified | Return to bug 11854
Collapse All | Expand All

(-)srclib/apr/misc/win32/start.c (-3 / +10 lines)
Lines 133-138 Link Here
133
                                             const char * const * *argv, 
133
                                             const char * const * *argv, 
134
                                             const char * const * *env)
134
                                             const char * const * *env)
135
{
135
{
136
    apr_status_t rv = apr_initialize();
137
138
    if (rv != APR_SUCCESS) {
139
        return rv;
140
    }
141
136
#if APR_HAS_UNICODE_FS
142
#if APR_HAS_UNICODE_FS
137
    IF_WIN_OS_IS_UNICODE
143
    IF_WIN_OS_IS_UNICODE
138
    {
144
    {
Lines 142-150 Link Here
142
        int dupenv;
148
        int dupenv;
143
149
144
        if (apr_app_init_complete) {
150
        if (apr_app_init_complete) {
145
            return apr_initialize();
151
            return rv;
146
        }
152
        }
147
153
154
        apr_app_init_complete = 1;
155
148
        sysstr = GetCommandLineW();
156
        sysstr = GetCommandLineW();
149
        if (sysstr) {
157
        if (sysstr) {
150
            wstrs = CommandLineToArgvW(sysstr, &wstrc);
158
            wstrs = CommandLineToArgvW(sysstr, &wstrc);
Lines 178-187 Link Here
178
            free(wenv);
186
            free(wenv);
179
        }
187
        }
180
188
181
        apr_app_init_complete = 1;
182
    }
189
    }
183
#endif
190
#endif
184
    return apr_initialize();
191
    return rv;
185
}
192
}
186
193
187
static int initialized = 0;
194
static int initialized = 0;

Return to bug 11854