From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 27 Apr 2011 16:43:50 +0000 (+0200)
Subject: Fix compile issues when using --enable-small and --disable-ssl/--disable-crypto
X-Git-Tag: v2.3-alpha1~236
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b70d99fb617350b252c8bde2f1f2d81d3f5b7955;p=thirdparty%2Fopenvpn.git

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>
---

diff --git a/options.h b/options.h
index a9c6a94db..8a515022b 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;