diff options
| author | Alberto Gonzalez Iniesta <agi@inittab.org> | 2016-11-21 09:37:33 +0100 |
|---|---|---|
| committer | Alberto Gonzalez Iniesta <agi@inittab.org> | 2016-11-21 09:37:33 +0100 |
| commit | 93b77cacdbb7e6f310c4e20f85c3a24ed5ba18ba (patch) | |
| tree | 55a7688c9969ef4d01625caa58c7f679098c76eb /src/openvpn/base64.c | |
| parent | daa9ef0efeb5e10a1b43820fbab3a4ff5fbd22f1 (diff) | |
| parent | 20c8675ba46bda97330a4117c459a59a9f1c465e (diff) | |
Merge tag 'upstream/2.4_beta1'
Upstream version 2.4~beta1
Diffstat (limited to 'src/openvpn/base64.c')
| -rw-r--r-- | src/openvpn/base64.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/openvpn/base64.c b/src/openvpn/base64.c index 7dccec2..258b258 100644 --- a/src/openvpn/base64.c +++ b/src/openvpn/base64.c @@ -39,8 +39,6 @@ #include "syshead.h" -#if defined(ENABLE_HTTP_PROXY) || defined(ENABLE_PKCS11) || defined(ENABLE_CLIENT_CR) || defined(MANAGMENT_EXTERNAL_KEY) - #include "base64.h" #include "memdbg.h" @@ -163,7 +161,3 @@ openvpn_base64_decode(const char *str, void *data, int size) } return q - (unsigned char *) data; } - -#else -static void dummy(void) {} -#endif /* ENABLE_HTTP_PROXY, ENABLE_PKCS11, ENABLE_CLIENT_CR */ |