Moved branch into official BETA21 position.

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

1 files changed, 2 insertions, 8 deletions

diff --git a/base64.c b/base64.c
index a69633d..7d876a6 100644
--- a/base64.c
+++ b/base64.c
@@ -31,15 +31,9 @@
  * SUCH DAMAGE.
  */
 
-#ifdef WIN32
-#include "config-win32.h"
-#else
-#include "config.h"
-#endif
-
 #include "syshead.h"
 
-#ifdef ENABLE_HTTP_PROXY
+#if defined(ENABLE_HTTP_PROXY) || defined(ENABLE_PKCS11)
 
 #include "base64.h"
 
@@ -143,7 +137,7 @@ base64_decode(const char *str, void *data)
     return q - (unsigned char *) data;
 }
 
-#endif /* NTLM */
+#endif /* NTLM, PKCS#11 */
 
 #else
 static void dummy(void) {}