* misc/unix/start.c

  (apr_initialize): Remove atomics initialization from this function.  Due
    to circular dependency, doing it here is too late.


* memory/unix/apr_pools.c

  (apr_pool_initialize): Add atomics initialization to the release and debug
    versions.  This has to happen here, since pools rely on mutexes, which
    can be backed by atomics.  Atomics initialization requires a pool.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64655 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 6 insertions, 3 deletions

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);