You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by cm...@apache.org on 2012/03/30 20:13:37 UTC

svn commit: r1307564 - in /subversion/trunk/subversion: libsvn_subr/crypto.h svn/main.c

Author: cmpilato
Date: Fri Mar 30 18:13:37 2012
New Revision: 1307564

URL: http://svn.apache.org/viewvc?rev=1307564&view=rev
Log:
* subversion/libsvn_subr/crypto.h,
* subversion/svn/main.c
  Gaaaaaaaaah!  Continue trying to get the right #include's and #define's
  to unbreak the build.

Modified:
    subversion/trunk/subversion/libsvn_subr/crypto.h
    subversion/trunk/subversion/svn/main.c

Modified: subversion/trunk/subversion/libsvn_subr/crypto.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/crypto.h?rev=1307564&r1=1307563&r2=1307564&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/crypto.h (original)
+++ subversion/trunk/subversion/libsvn_subr/crypto.h Fri Mar 30 18:13:37 2012
@@ -24,11 +24,12 @@
 #ifndef SVN_LIBSVN_SUBR_CRYPTO_H
 #define SVN_LIBSVN_SUBR_CRYPTO_H
 
-#include <apr.h>
-#include <apr_crypto.h>
+#include <apu.h>  /* for APU_HAVE_CRYPTO */
 
 #ifdef APU_HAVE_CRYPTO
 
+#include <apr_crypto.h>
+
 /* Set *CRYPTO_CTX to an APR-managed OpenSSL cryptography context
    object allocated from POOL. */
 /* ### TODO: Should this be something done once at apr_crypto_init()

Modified: subversion/trunk/subversion/svn/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=1307564&r1=1307563&r2=1307564&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Fri Mar 30 18:13:37 2012
@@ -34,6 +34,7 @@
 #include <apr_tables.h>
 #include <apr_general.h>
 #include <apr_signal.h>
+#include <apu.h>  /* for APU_HAVE_CRYPTO */
 
 #ifdef APU_HAVE_CRYPTO
 #include <apr_crypto.h>