Index: subversion/libsvn_subr/atomic.c
===================================================================
--- subversion/libsvn_subr/atomic.c	(revision 25577)
+++ subversion/libsvn_subr/atomic.c	(working copy)
@@ -40,7 +40,7 @@
       svn_error_t *err = init_func(pool);
       if (err)
         {
-#ifdef APR_HAS_THREADS
+#if APR_HAS_THREADS
           /* Tell other threads that the initialization failed. */
           svn_atomic_cas(global_status,
                          SVN_ATOMIC_INIT_FAILED,
@@ -52,7 +52,7 @@
                      SVN_ATOMIC_INITIALIZED,
                      SVN_ATOMIC_START_INIT);
     }
-#ifdef APR_HAS_THREADS
+#if APR_HAS_THREADS
   /* Wait for whichever thread is performing initialization to finish. */
   /* XXX FIXME: Should we have a maximum wait here, like we have in
                 the Windows file IO spinner? */
Index: subversion/libsvn_ra_svn/cyrus_auth.c
===================================================================
--- subversion/libsvn_ra_svn/cyrus_auth.c	(revision 25577)
+++ subversion/libsvn_ra_svn/cyrus_auth.c	(working copy)
@@ -67,7 +67,7 @@
   return APR_SUCCESS;
 }
 
-#ifdef APR_HAS_THREADS
+#if APR_HAS_THREADS
 /* Cyrus SASL is thread-safe only if we supply it with mutex functions
  * (with sasl_set_mutex()).  To make this work with APR, we need to use the
  * global sasl_pool for the mutex allocations.  Freeing a mutex actually
@@ -150,7 +150,7 @@
   sasl_ctx_count = 1;
   apr_pool_cleanup_register(sasl_pool, NULL, sasl_done_cb, 
                             apr_pool_cleanup_null);
-#ifdef APR_HAS_THREADS
+#if APR_HAS_THREADS
   sasl_set_mutex(sasl_mutex_alloc_cb,
                  sasl_mutex_lock_cb,
                  sasl_mutex_unlock_cb,