[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-commits
Subject:    svn commit: r1307747 - /subversion/trunk/subversion/svn/main.c
From:       rhuijben () apache ! org
Date:       2012-03-31 9:18:23
Message-ID: 20120331091823.D612C238890B () eris ! apache ! org
[Download RAW message or body]

Author: rhuijben
Date: Sat Mar 31 09:18:23 2012
New Revision: 1307747

URL: http://svn.apache.org/viewvc?rev=1307747&view=rev
Log:
* subversion/svn/main.c
  (includes): Perform the right check for APU_HAVE_CRYPTO.
  (crypto_init): Add ### comment and use APU_HAVE_CRYPTO properly.

Modified:
    subversion/trunk/subversion/svn/main.c

Modified: subversion/trunk/subversion/svn/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=1307747&r1=1307746&r2=1307747&view=diff
 ==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Sat Mar 31 09:18:23 2012
@@ -36,7 +36,7 @@
 #include <apr_signal.h>
 #include <apu.h>  /* for APU_HAVE_CRYPTO */
 
-#ifdef APU_HAVE_CRYPTO
+#if APU_HAVE_CRYPTO
 #include <apr_crypto.h>
 #endif
 
@@ -1541,11 +1541,19 @@ svn_cl__check_cancel(void *baton)
 }
 
 /* Initialize the APR cryptography subsystem (if available), using
-   POOL for the registration of cleanups, shutdowns, etc. */
+   POOL for the registration of cleanups, shutdowns, etc. 
+   
+   ### Maybe this should move to one of our library initialization routines
+   ### or an atomic initializer from the new api, in order not to break
+   ### backwards compatibility with older api users.
+   
+   ### If not this should be duplicated in svnsync, svnmucc, javahl, the swig
+   ### bindings, etc. etc. when we switch to the master password.
+   */
 static svn_error_t *
 crypto_init(apr_pool_t *pool)
 {
-#ifdef APU_HAVE_CRYPTO
+#if APU_HAVE_CRYPTO
   apr_status_t apr_err = apr_crypto_init(pool);
   if (apr_err)
     return svn_error_wrap_apr(apr_err,


[prev in list] [next in list] [prev in thread] [next in thread]