diff options
author | David Sommerseth <dazo@users.sourceforge.net> | 2010-11-13 00:48:28 +0100 |
---|---|---|
committer | David Sommerseth <dazo@users.sourceforge.net> | 2010-11-13 00:48:28 +0100 |
commit | 8367889e8467ce73b051aa8db64b0336aea8ed4b (patch) | |
tree | 99578b1e6969d7eeb19b2578137c1c92de2fc49b /base64.h | |
parent | Preparing for v2.2-beta3 (diff) | |
parent | Version 2.1.3b (diff) | |
download | openvpn-8367889e8467ce73b051aa8db64b0336aea8ed4b.tar.xz |
Merge branch 'svn-BETA21' into beta2.2
Conflicts:
version.m4
- Reset version.m4 to a more neutral version number
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Diffstat (limited to 'base64.h')
-rw-r--r-- | base64.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -34,7 +34,7 @@ #ifndef _BASE64_H_ #define _BASE64_H_ -#ifdef ENABLE_HTTP_PROXY +#if defined(ENABLE_HTTP_PROXY) || defined(ENABLE_PKCS11) || defined(ENABLE_CLIENT_CR) int base64_encode(const void *data, int size, char **str); int base64_decode(const char *str, void *data); |