aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2011-04-27 18:43:50 +0200
committerDavid Sommerseth <dazo@users.sourceforge.net>2011-04-27 18:43:50 +0200
commitb70d99fb617350b252c8bde2f1f2d81d3f5b7955 (patch)
treebf9b66ba39861ac7c2597fb8f3c71ab881272c0d
parentSolved hidden merge conflicts between master and svn-branch-2.1 (diff)
downloadopenvpn-b70d99fb617350b252c8bde2f1f2d81d3f5b7955.tar.xz
Fix compile issues when using --enable-small and --disable-ssl/--disable-crypto
The tmp_dir string is required in the options struct regardless of options so spin it out of #if conditionals. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Acked-by: David Sommerseth <dazo@users.sourceforge.net> Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
-rw-r--r--options.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/options.h b/options.h
index a9c6a94..8a51502 100644
--- a/options.h
+++ b/options.h
@@ -369,6 +369,8 @@ struct options
struct plugin_option_list *plugin_list;
#endif
+ const char *tmp_dir;
+
#if P2MP
#if P2MP_SERVER
@@ -409,7 +411,6 @@ struct options
const char *client_connect_script;
const char *client_disconnect_script;
const char *learn_address_script;
- const char *tmp_dir;
const char *client_config_dir;
bool ccd_exclusive;
bool disable;