diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/netware/aprlib.def | 1 | ||||
| -rw-r--r-- | misc/unix/start.c | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/misc/netware/aprlib.def b/misc/netware/aprlib.def index 973612427..0a2a01eb8 100644 --- a/misc/netware/aprlib.def +++ b/misc/netware/aprlib.def @@ -1,4 +1,3 @@ MODULE LIBC.NLM MODULE WS2_32.NLM -IMPORT CpuCurrentProcessor EXPORT @aprlib.imp diff --git a/misc/unix/start.c b/misc/unix/start.c index 48c815651..2dce9831f 100644 --- a/misc/unix/start.c +++ b/misc/unix/start.c @@ -99,9 +99,12 @@ APR_DECLARE(apr_status_t) apr_initialize(void) apr_pool_tag(pool, "apr_initialize"); - if ((status = apr_atomic_init(pool)) != APR_SUCCESS) { - return status; - } + /* apr_atomic_init() used to be called from here aswell. + * Pools rely on mutexes though, which can be backed by + * atomics. Due to this circular dependency + * apr_pool_initialize() is taking care of calling + * apr_atomic_init() at the correct time. + */ apr_signal_init(pool); |