From: James Yonan <james@openvpn.net>
Date: Tue, 16 Nov 2010 09:10:39 +0000 (+0000)
Subject: Fixes to prevent compile breakage when --disable-crypto is used.
X-Git-Tag: v2.2-beta4~3^2~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d12eb12cf2a49adbc2e89e20990415947519900;p=thirdparty%2Fopenvpn.git

Fixes to prevent compile breakage when --disable-crypto is used.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@6656 e7ae566f-a301-0410-adde-c780ea21d3b5
---

diff --git a/base64.c b/base64.c
index 2cc39444e..3449ae58a 100644
--- a/base64.c
+++ b/base64.c
@@ -80,8 +80,6 @@ base64_encode(const void *data, int size, char **str)
     return strlen(s);
 }
 
-#if NTLM
-
 static int 
 pos(char c)
 {
@@ -137,8 +135,6 @@ base64_decode(const char *str, void *data)
     return q - (unsigned char *) data;
 }
 
-#endif /* NTLM, PKCS#11 */
-
 #else
 static void dummy(void) {}
-#endif
+#endif /* ENABLE_HTTP_PROXY, ENABLE_PKCS11, ENABLE_CLIENT_CR */
diff --git a/options.c b/options.c
index 5f1efc5dd..b95ceb59e 100644
--- a/options.c
+++ b/options.c
@@ -45,6 +45,7 @@
 #include "pool.h"
 #include "helper.h"
 #include "manage.h"
+#include "forward.h"
 
 #include "memdbg.h"