diff options
| author | James Yonan <james@openvpn.net> | 2014-05-08 16:50:36 -0600 |
|---|---|---|
| committer | Gert Doering <gert@greenie.muc.de> | 2014-05-20 11:11:42 +0200 |
| commit | 5b17803ebbb0989cf66033387dfa1ae7cb41bb25 (patch) | |
| tree | 0375f68426d90e5320c38f8da67cc624d81dfb84 /src/openvpn/options.c | |
| parent | e583cae83b8c2590dad0c4ce238bc2a45196f914 (diff) | |
| download | openvpn-5b17803ebbb0989cf66033387dfa1ae7cb41bb25.tar.gz openvpn-5b17803ebbb0989cf66033387dfa1ae7cb41bb25.tar.xz openvpn-5b17803ebbb0989cf66033387dfa1ae7cb41bb25.zip | |
Fixed some compile issues with show_library_versions()
* Refactored show_library_versions to work around the fact
that some compilers (such as MSVC 2008) can't handle #ifdefs
inside of macro references.
* Declare show_library_versions() in options.h because it's
referenced by other files such as openvpn.c.
* Declare get_ssl_library_version() as returning const char *,
to avoid loss of const qualifier in ssl_openssl.c.
Signed-off-by: James Yonan <james@openvpn.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1399589436-8730-7-git-send-email-james@openvpn.net>
URL: http://article.gmane.org/gmane.network.openvpn.devel/8711
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit a91a2d6ad7b139ec78d61c8616b8447847e9ecc6)
Diffstat (limited to 'src/openvpn/options.c')
| -rw-r--r-- | src/openvpn/options.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/openvpn/options.c b/src/openvpn/options.c index fe9b99d..57f8949 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -3439,18 +3439,21 @@ usage_small (void) void show_library_versions(const unsigned int flags) { - msg (flags, "library versions: %s%s%s", #ifdef ENABLE_SSL - get_ssl_library_version(), +#define SSL_LIB_VER_STR get_ssl_library_version() #else - "", +#define SSL_LIB_VER_STR "" #endif #ifdef ENABLE_LZO - ", LZO ", lzo_version_string() +#define LZO_LIB_VER_STR ", LZO ", lzo_version_string() #else - "", "" +#define LZO_LIB_VER_STR "", "" #endif - ); + + msg (flags, "library versions: %s%s%s", SSL_LIB_VER_STR, LZO_LIB_VER_STR); + +#undef SSL_LIB_VER_STR +#undef LZO_LIB_VER_STR } static void |