build: move out config.h include from syshead

Yet another step in reducing the syshead.h content.

Conditional compilation of sources needs to be based on
a minimum program prefix (config.h only).

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>

diff --git a/src/openvpn/base64.c b/src/openvpn/base64.c
index 303d773a97cd51558e1527a62a658656f14db5fc..bb89aae38062bfd0912abffe85e9c169637a739a 100644 (file)
--- a/src/openvpn/base64.c
+++ b/src/openvpn/base64.c
@@ -31,6 +31,12 @@
  * SUCH DAMAGE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #if defined(ENABLE_HTTP_PROXY) || defined(ENABLE_PKCS11) || defined(ENABLE_CLIENT_CR) || defined(MANAGMENT_EXTERNAL_KEY)

diff --git a/src/openvpn/buffer.c b/src/openvpn/buffer.c
index 391085b9a960c9cebc3b53692dc1af729e56fd6f..ad30223c6bedab30198d6abf3faf0929b8f46f66 100644 (file)
--- a/src/openvpn/buffer.c
+++ b/src/openvpn/buffer.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #include "common.h"

diff --git a/src/openvpn/clinat.c b/src/openvpn/clinat.c
index 8e85e2268b48000e5826b5a6cef0bf8b6afcf8aa..af75fc9d9d897424c85edd31a65a7f9debbf31a4 100644 (file)
--- a/src/openvpn/clinat.c
+++ b/src/openvpn/clinat.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #if defined(ENABLE_CLIENT_NAT)

diff --git a/src/openvpn/compat.c b/src/openvpn/compat.c
index 2b1098e8f9505cc4c7b350d9b8ff5d995e2b6b56..f2fa265cb35567fce385b2a54b4a433016ad2530 100644 (file)
--- a/src/openvpn/compat.c
+++ b/src/openvpn/compat.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 #include "compat.h"
 #include <string.h>

diff --git a/src/openvpn/crypto.c b/src/openvpn/crypto.c
index 9e7fa875774af2e409654b8952bd2e6c1f34fb0a..2e2e5d7ade1e1a7c0ad07afbc9dc2f515c6052ff 100644 (file)
--- a/src/openvpn/crypto.c
+++ b/src/openvpn/crypto.c
@@ -23,6 +23,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #ifdef ENABLE_CRYPTO

diff --git a/src/openvpn/crypto_openssl.c b/src/openvpn/crypto_openssl.c
index 72b0c3c2c24eacc46f568c0addae265c778f0d41..4a3be1e0511c13adc63b34b1ac3a621d67570e54 100644 (file)
--- a/src/openvpn/crypto_openssl.c
+++ b/src/openvpn/crypto_openssl.c
@@ -27,6 +27,12 @@
  * @file Data Channel Cryptography OpenSSL-specific backend interface
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #if defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_OPENSSL)

diff --git a/src/openvpn/crypto_polarssl.c b/src/openvpn/crypto_polarssl.c
index 7a7d9b0f284d2d1c69c31551154b9fc09948eaa1..0e6728c8155ac97811e109e787cf3a30c7343ce0 100644 (file)
--- a/src/openvpn/crypto_polarssl.c
+++ b/src/openvpn/crypto_polarssl.c
@@ -27,6 +27,12 @@
  * @file Data Channel Cryptography PolarSSL-specific backend interface
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #if defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_POLARSSL)

diff --git a/src/openvpn/cryptoapi.c b/src/openvpn/cryptoapi.c
index fed91c566d0a6087eef4617bb65bfbee64c2f127..b7fc11e07016e1894aef02502b6e1c7259866cac 100644 (file)
--- a/src/openvpn/cryptoapi.c
+++ b/src/openvpn/cryptoapi.c
@@ -28,6 +28,12 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #ifdef ENABLE_CRYPTOAPI

diff --git a/src/openvpn/dhcp.c b/src/openvpn/dhcp.c
index 280a4af302434540cb1c0206646a65d8ba6c70ce..8d0b18ac6cfee7a9948857f6f8fb985593026e89 100644 (file)
--- a/src/openvpn/dhcp.c
+++ b/src/openvpn/dhcp.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #include "dhcp.h"

diff --git a/src/openvpn/error.c b/src/openvpn/error.c
index 3de5487c0e6cec16d7d990d5d23a1c535f5c6bfc..1f2dd86a8928b36b666fd3dadaecadc1d759db16 100644 (file)
--- a/src/openvpn/error.c
+++ b/src/openvpn/error.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #include "error.h"

diff --git a/src/openvpn/event.c b/src/openvpn/event.c
index b6ed67385e26f0000491a54893013eb21442fcd8..2a13e1cfc99d03ae8c49c4b809a4a3539d64a0ee 100644 (file)
--- a/src/openvpn/event.c
+++ b/src/openvpn/event.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #include "buffer.h"

diff --git a/src/openvpn/fdmisc.c b/src/openvpn/fdmisc.c
index 5be3c8ba1b1064e63db25fabc08c0f52afd42eb1..8dc11b1b1a5dc53a3597bc0c8436eeb14f166af0 100644 (file)
--- a/src/openvpn/fdmisc.c
+++ b/src/openvpn/fdmisc.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #include "fdmisc.h"

diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c
index 5e1e2a63d3881c8d45c2220213065c7b73a8d5fa..e13b81a826e8ccc4fcac8599347d5720c575efa7 100644 (file)
--- a/src/openvpn/forward.c
+++ b/src/openvpn/forward.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #include "forward.h"

diff --git a/src/openvpn/fragment.c b/src/openvpn/fragment.c
index 5ef3a4751235a569579b861f5df2fecaff23d385..7ad1d616fbc6e234e0ab8f2fd7f141bf08e2cde0 100644 (file)
--- a/src/openvpn/fragment.c
+++ b/src/openvpn/fragment.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #ifdef ENABLE_FRAGMENT

diff --git a/src/openvpn/gremlin.c b/src/openvpn/gremlin.c
index c7c02063c369632f03b539c30da9b3d86a2da460..f0aa7f619c2005447114a7abe87198dc3d771e17 100644 (file)
--- a/src/openvpn/gremlin.c
+++ b/src/openvpn/gremlin.c
@@ -27,6 +27,12 @@
  * network outages when the --gremlin option is used.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #ifdef ENABLE_DEBUG

diff --git a/src/openvpn/helper.c b/src/openvpn/helper.c
index 22ea652dd8813fc2a2ce45422b935df71fae565c..d9eef03bf45153ca6ead3d3fc95e520a9be73d65 100644 (file)
--- a/src/openvpn/helper.c
+++ b/src/openvpn/helper.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #include "forward.h"

diff --git a/src/openvpn/httpdigest.c b/src/openvpn/httpdigest.c
index 1aa19ae2567f411152d8272505c4a0236c3952ea..78b8344d7c63081cdd61735a1ea3f8704936d26f 100644 (file)
--- a/src/openvpn/httpdigest.c
+++ b/src/openvpn/httpdigest.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #if PROXY_DIGEST_AUTH

diff --git a/src/openvpn/init.c b/src/openvpn/init.c
index 1959b298b7a36720e1af42d1ceb0831f3279d37a..a07f02167dd4ff6ce1377ece2b7d283665d40e5b 100644 (file)
--- a/src/openvpn/init.c
+++ b/src/openvpn/init.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #include "win32.h"

diff --git a/src/openvpn/interval.c b/src/openvpn/interval.c
index 44d59d04290be26f41b9fc5cdf68d308aae71689..64494f1b4ced71f3afeda6b74cd408050d42fad0 100644 (file)
--- a/src/openvpn/interval.c
+++ b/src/openvpn/interval.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #include "interval.h"

diff --git a/src/openvpn/list.c b/src/openvpn/list.c
index fb93d0a9a156daac809fc4286928a3e983162ed1..ea6bd74bd86c4bb4b196cee71b8cb687b52e2341 100644 (file)
--- a/src/openvpn/list.c
+++ b/src/openvpn/list.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #if P2MP_SERVER

diff --git a/src/openvpn/lladdr.c b/src/openvpn/lladdr.c
index fc01b63e64d12b083761298e2e12a83176d332e6..57f447b32e76299ac73020cd590b8c5261f60553 100644 (file)
--- a/src/openvpn/lladdr.c
+++ b/src/openvpn/lladdr.c
@@ -2,6 +2,12 @@
  * Support routine for configuring link layer address 
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 #include "error.h"
 #include "misc.h"

diff --git a/src/openvpn/lzo.c b/src/openvpn/lzo.c
index 4becd4d274744eb0fe6329238fef1d1dadbdd13f..195b8194612d732c07eab8aa60364a583b16d044 100644 (file)
--- a/src/openvpn/lzo.c
+++ b/src/openvpn/lzo.c
@@ -26,6 +26,12 @@
  * @file Data Channel Compression module function definitions.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #ifdef ENABLE_LZO

diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c
index e84a423471487c465b0b92d323b9035bc907a2b4..85c9acab081a1398c648022072c98795e8aae7c9 100644 (file)
--- a/src/openvpn/manage.c
+++ b/src/openvpn/manage.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #ifdef ENABLE_MANAGEMENT

diff --git a/src/openvpn/mbuf.c b/src/openvpn/mbuf.c
index 0f36d3c30336134c310ea9cdac8d91f01186a498..82f2388800d0a1413f291108f41b78696fd7c2d0 100644 (file)
--- a/src/openvpn/mbuf.c
+++ b/src/openvpn/mbuf.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #if P2MP

diff --git a/src/openvpn/misc.c b/src/openvpn/misc.c
index d6fd2b57db13125f0a6df09e4af6df6d3362ebf6..f211a1df34ef8d4363304771b48c7076d0dd5885 100644 (file)
--- a/src/openvpn/misc.c
+++ b/src/openvpn/misc.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #include "buffer.h"

diff --git a/src/openvpn/mroute.c b/src/openvpn/mroute.c
index 285b15189d246c790ceb973a780782dfeff99e98..5b5357115f671481932eeabdbb2b980ad0fe42b9 100644 (file)
--- a/src/openvpn/mroute.c
+++ b/src/openvpn/mroute.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #if P2MP_SERVER

diff --git a/src/openvpn/mss.c b/src/openvpn/mss.c
index 660b62c892de51dbaa0b73590179aa89f93984ce..8981badcedbd1ebf128be62dac463e49daf9b390 100644 (file)
--- a/src/openvpn/mss.c
+++ b/src/openvpn/mss.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 #include "error.h"
 #include "mss.h"

diff --git a/src/openvpn/mstats.c b/src/openvpn/mstats.c
index 2f29d945531867eff4707931472564652c062d3a..b4b864bd6954bf695ffe52324af0b9bd197e1ccf 100644 (file)
--- a/src/openvpn/mstats.c
+++ b/src/openvpn/mstats.c
@@ -26,6 +26,12 @@
  * Maintain usage stats in a memory-mapped file
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #if defined(ENABLE_MEMSTATS)

diff --git a/src/openvpn/mtcp.c b/src/openvpn/mtcp.c
index 662cb9a1a9f2158613d2bdc0c90c42b3a29df24f..dc15f092a7b38e9715bbf0202290ea351f7c10c4 100644 (file)
--- a/src/openvpn/mtcp.c
+++ b/src/openvpn/mtcp.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #if P2MP_SERVER

diff --git a/src/openvpn/mtu.c b/src/openvpn/mtu.c
index 494f939ed48fc3265f794aec6ff3f270ac7d0890..13f3f6c63baf8f59416e63c1ce3b7189095f9939 100644 (file)
--- a/src/openvpn/mtu.c
+++ b/src/openvpn/mtu.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #include "common.h"

diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c
index 7648ec645a0b8c234a317902503544d7a3f39f34..3468dab5b6c2113954c4655811252b4073e7bb72 100644 (file)
--- a/src/openvpn/mudp.c
+++ b/src/openvpn/mudp.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #if P2MP_SERVER

diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
index 65a834b0f1f67b13915d86d162c7855b42223cf1..e79c6f1cf3b798e7376d801d9b1f3f1012698c25 100644 (file)
--- a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #if P2MP_SERVER

diff --git a/src/openvpn/ntlm.c b/src/openvpn/ntlm.c
index 217173f3b03a979a97f929276c0aa9b7ebb13e0d..3390bdddfe0b022b4726909042eed13eba992bc6 100644 (file)
--- a/src/openvpn/ntlm.c
+++ b/src/openvpn/ntlm.c
@@ -21,6 +21,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #if NTLM

diff --git a/src/openvpn/occ.c b/src/openvpn/occ.c
index 2fdbff07c90ac7a7bb7b1b49e1674bb32f7b76ec..ff48706962543562680338bbbae0389665e97a7d 100644 (file)
--- a/src/openvpn/occ.c
+++ b/src/openvpn/occ.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #ifdef ENABLE_OCC

diff --git a/src/openvpn/openvpn.c b/src/openvpn/openvpn.c
index b2175a19f87bab7adf46d2bd5493582b06cd892c..75c751d5fae9c61279a23f0f263e555a66d27afb 100644 (file)
--- a/src/openvpn/openvpn.c
+++ b/src/openvpn/openvpn.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #include "init.h"

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index e94df273291377b443d2a4afdb71d3c831bcd61d..842f72c55c61ffb39e4d108eb1f766931616061a 100644 (file)
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -30,6 +30,12 @@
  *   (Christof Meerwald, http://cmeerw.org)
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #include "buffer.h"

diff --git a/src/openvpn/otime.c b/src/openvpn/otime.c
index b295646f560559a51efd766047c05fa3af38a74f..173573c8948ad42c8826f023bcb9adf19908b95e 100644 (file)
--- a/src/openvpn/otime.c
+++ b/src/openvpn/otime.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #include "otime.h"

diff --git a/src/openvpn/packet_id.c b/src/openvpn/packet_id.c
index fceead988d8d29589ee53ec0c904a727e8be4303..186f0740280e3121326deef120f090bd16b9b439 100644 (file)
--- a/src/openvpn/packet_id.c
+++ b/src/openvpn/packet_id.c
@@ -31,6 +31,12 @@
  * to IPSec.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #ifdef ENABLE_CRYPTO

diff --git a/src/openvpn/perf.c b/src/openvpn/perf.c
index d9dbafc32d0fed689b3ae15257dc0b5c8c7ecc8d..910d171d896a64f3d287f5e9b2eca36914be4894 100644 (file)
--- a/src/openvpn/perf.c
+++ b/src/openvpn/perf.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #include "perf.h"

diff --git a/src/openvpn/pf.c b/src/openvpn/pf.c
index 0ef839e01276b029f2c2ecb159421977415dec73..729792ea1e40403870af4a8a022f80f24c22cc40 100644 (file)
--- a/src/openvpn/pf.c
+++ b/src/openvpn/pf.c
@@ -24,6 +24,12 @@
 
 /* packet filter functions */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #if defined(ENABLE_PF)

diff --git a/src/openvpn/ping.c b/src/openvpn/ping.c
index 191ad742b0da37287c073f58a1c1597c2056adea..6dc0b4e55c4cf358e99fc46b6e2643f41fd789df 100644 (file)
--- a/src/openvpn/ping.c
+++ b/src/openvpn/ping.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #include "ping.h"

diff --git a/src/openvpn/pkcs11.c b/src/openvpn/pkcs11.c
index 7c0b90a91ca34bafe9406c93bbc5f4fd930b49bf..2189208d46481f2fa6a72fb28b082162ee11e2b3 100644 (file)
--- a/src/openvpn/pkcs11.c
+++ b/src/openvpn/pkcs11.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #if defined(ENABLE_PKCS11)

diff --git a/src/openvpn/pkcs11_openssl.c b/src/openvpn/pkcs11_openssl.c
index 4a14b7ce0767ca5c3d8c06d983277c5126f04931..18651fd9203e08c7221388ad01c1de8f55e0b89c 100644 (file)
--- a/src/openvpn/pkcs11_openssl.c
+++ b/src/openvpn/pkcs11_openssl.c
@@ -27,6 +27,12 @@
  * @file PKCS #11 OpenSSL backend
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #if defined(ENABLE_PKCS11) && defined(ENABLE_CRYPTO_OPENSSL)

diff --git a/src/openvpn/pkcs11_polarssl.c b/src/openvpn/pkcs11_polarssl.c
index 349c312fd1a81646412957ef9346863896fc36c2..ecef4d391b0658908e1510516b535e57626bbf56 100644 (file)
--- a/src/openvpn/pkcs11_polarssl.c
+++ b/src/openvpn/pkcs11_polarssl.c
@@ -27,6 +27,12 @@
  * @file PKCS #11 PolarSSL backend
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #if defined(ENABLE_PKCS11) && defined(ENABLE_CRYPTO_POLARSSL)

diff --git a/src/openvpn/plugin.c b/src/openvpn/plugin.c
index a975161335232401b8f63df6d5a1e46c8eb8ffd4..7ce2f5e709352d763efe1e44d34f2de4290b1a80 100644 (file)
--- a/src/openvpn/plugin.c
+++ b/src/openvpn/plugin.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #ifdef ENABLE_PLUGIN

diff --git a/src/openvpn/pool.c b/src/openvpn/pool.c
index 60dc520c0361f791198f8c2d9783ad10b8778d9f..28c26b4da2b0d3abfc2c108c046e054878ab1185 100644 (file)
--- a/src/openvpn/pool.c
+++ b/src/openvpn/pool.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #include "pool.h"

diff --git a/src/openvpn/proto.c b/src/openvpn/proto.c
index 65a6b6739747dd38e90046e3c0479947de46613d..2cf8314b3d56dcfe6c7aee5cbd22ccd1cb7bb47a 100644 (file)
--- a/src/openvpn/proto.c
+++ b/src/openvpn/proto.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #include "proto.h"

diff --git a/src/openvpn/proxy.c b/src/openvpn/proxy.c
index 5e74af2e61bd3df1cd159186cbd82814bd30712d..991e165df60c47bfd5494ef017a14084923c24ab 100644 (file)
--- a/src/openvpn/proxy.c
+++ b/src/openvpn/proxy.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #include "common.h"

diff --git a/src/openvpn/ps.c b/src/openvpn/ps.c
index 182925b37d40c32d1c870f112b83f0742f2bb215..a4e50e8783c26ce422c04608610c4475cbd5022c 100644 (file)
--- a/src/openvpn/ps.c
+++ b/src/openvpn/ps.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #if PORT_SHARE

diff --git a/src/openvpn/push.c b/src/openvpn/push.c
index 8a8779dca71b8feccc59c2aba509fa0f378df763..8d7d23a5183f5b9e580829942b48bf51429763f2 100644 (file)
--- a/src/openvpn/push.c
+++ b/src/openvpn/push.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #include "push.h"

diff --git a/src/openvpn/reliable.c b/src/openvpn/reliable.c
index 7c0bb5411646304326ee82a613ec23e8371071ad..763169edf1c270835d573c1a5773d035ab409628 100644 (file)
--- a/src/openvpn/reliable.c
+++ b/src/openvpn/reliable.c
@@ -27,6 +27,12 @@
  * so that SSL/TLS can be run over UDP.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #if defined(ENABLE_CRYPTO) && defined(ENABLE_SSL)

diff --git a/src/openvpn/route.c b/src/openvpn/route.c
index ca8f1da883078a960c51ebd5417eb18709ab5306..bf7af631818df00c9f6c17ef127271c59828b0b9 100644 (file)
--- a/src/openvpn/route.c
+++ b/src/openvpn/route.c
@@ -26,6 +26,12 @@
  * Support routines for adding/deleting network routes.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #include "common.h"

diff --git a/src/openvpn/schedule.c b/src/openvpn/schedule.c
index f0482abad2334a8cf948cbb6f7cf3c34e48bc2d8..471330f004efaea48e50a52c6743b811cb3960ab 100644 (file)
--- a/src/openvpn/schedule.c
+++ b/src/openvpn/schedule.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #if P2MP_SERVER

diff --git a/src/openvpn/session_id.c b/src/openvpn/session_id.c
index 7caf1053e1d100a7aa028852ac1538aaafa5fce8..2e07b54712c49107caeacddaf11d6ca49488c402 100644 (file)
--- a/src/openvpn/session_id.c
+++ b/src/openvpn/session_id.c
@@ -31,6 +31,12 @@
  * it is called the key_id and is currently 2 bits long.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #if defined(ENABLE_CRYPTO) && defined(ENABLE_SSL)

diff --git a/src/openvpn/shaper.c b/src/openvpn/shaper.c
index 1a89fc277e3b7ef6d0c2ecf12a9a45b95c4fdf47..6b445e228e938d23d9a0caa0179d48177a1ed763 100644 (file)
--- a/src/openvpn/shaper.c
+++ b/src/openvpn/shaper.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 #include "shaper.h"
 #include "memdbg.h"

diff --git a/src/openvpn/sig.c b/src/openvpn/sig.c
index 231f676a53dd4830aa4aa01c3a15789c7be44c42..0ebde245789c7f7450ef1d6ed41980cce10b13df 100644 (file)
--- a/src/openvpn/sig.c
+++ b/src/openvpn/sig.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #include "buffer.h"

diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c
index 0df58d189ae31d41fb3f500428710a9fc0ba6d73..e1526ffc76101c2fe54678e67768a39289ef1b8f 100644 (file)
--- a/src/openvpn/socket.c
+++ b/src/openvpn/socket.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #include "socket.h"

diff --git a/src/openvpn/socks.c b/src/openvpn/socks.c
index 949d25600cc78d6ee9307f49e188c2a879cad027..510c1102df3d2cde2a5f1aa997e2f03cf57261b8 100644 (file)
--- a/src/openvpn/socks.c
+++ b/src/openvpn/socks.c
@@ -30,6 +30,12 @@
  *   (Pierre Bourdon <delroth@gmail.com>)
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #ifdef ENABLE_SOCKS

diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c
index caafd183cd6e764a138dd347b4b4531918808b0f..251f8ed11751021fc0983bdd200ccef3d9234619 100644 (file)
--- a/src/openvpn/ssl.c
+++ b/src/openvpn/ssl.c
@@ -39,6 +39,12 @@
  * over the same TCP/UDP port.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #if defined(ENABLE_CRYPTO) && defined(ENABLE_SSL)

diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c
index 9a0c4d011633e002dc629d27669575679834f675..6a60cb5da22a1348e2554acca88eaf050971d748 100644 (file)
--- a/src/openvpn/ssl_openssl.c
+++ b/src/openvpn/ssl_openssl.c
@@ -27,6 +27,12 @@
  * @file Control Channel OpenSSL Backend
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #if defined(ENABLE_SSL) && defined(ENABLE_CRYPTO_OPENSSL)

diff --git a/src/openvpn/ssl_polarssl.c b/src/openvpn/ssl_polarssl.c
index 795da1b3d9ac7c246f1b32796bde9b9ae7937d9a..d4d85c8ed3285499d7250c1c9a1321a3ced2c966 100644 (file)
--- a/src/openvpn/ssl_polarssl.c
+++ b/src/openvpn/ssl_polarssl.c
@@ -27,6 +27,12 @@
  * @file Control Channel PolarSSL Backend
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #if defined(ENABLE_SSL) && defined(ENABLE_CRYPTO_POLARSSL)

diff --git a/src/openvpn/ssl_verify.c b/src/openvpn/ssl_verify.c
index 0fa1137cb189dd8daf8af90a55f3607650bb903a..51457f826a627411605555e29ba9bc17bb74f2bd 100644 (file)
--- a/src/openvpn/ssl_verify.c
+++ b/src/openvpn/ssl_verify.c
@@ -27,6 +27,12 @@
  * @file Control Channel Verification Module
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #if defined(ENABLE_CRYPTO) && defined(ENABLE_SSL)

diff --git a/src/openvpn/ssl_verify_openssl.c b/src/openvpn/ssl_verify_openssl.c
index e647c2a3456f8c6cf539196110ddfaaebd313111..1ccfc60a5e4efa463089cd92a03095f27c12cb23 100644 (file)
--- a/src/openvpn/ssl_verify_openssl.c
+++ b/src/openvpn/ssl_verify_openssl.c
@@ -27,6 +27,12 @@
  * @file Control Channel Verification Module OpenSSL implementation
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #if defined(ENABLE_SSL) && defined(ENABLE_CRYPTO_OPENSSL)

diff --git a/src/openvpn/ssl_verify_polarssl.c b/src/openvpn/ssl_verify_polarssl.c
index 249e687e586fbc348b020379898833b5d107e310..53e6006e1b4dc18c0261d23d6b49231a43d51652 100644 (file)
--- a/src/openvpn/ssl_verify_polarssl.c
+++ b/src/openvpn/ssl_verify_polarssl.c
@@ -27,6 +27,12 @@
  * @file Control Channel Verification Module PolarSSL backend
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #if defined(ENABLE_SSL) && defined(ENABLE_CRYPTO_POLARSSL)

diff --git a/src/openvpn/status.c b/src/openvpn/status.c
index 8fd89ef2a0619cecacad4413d6ab58834cbe2f68..0be5e4c2af3705d3e0722d000d1bb9172554de42 100644 (file)
--- a/src/openvpn/status.c
+++ b/src/openvpn/status.c
@@ -22,6 +22,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #include "status.h"

diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h
index bca842c08a6aa6f38bc2f27672a0681a4dc062dc..f9636f7d33c3ea7800f4345b0acc28dafce8a0ad 100644 (file)
--- a/src/openvpn/syshead.h
+++ b/src/openvpn/syshead.h
@@ -25,15 +25,6 @@
 #ifndef SYSHEAD_H
 #define SYSHEAD_H
 
-/*
- * Only include if not during configure
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#elif defined(_MSC_VER)
-#include "config-msvc.h"
-#endif
-
 #include "compat.h"
 
 /* branch prediction hints */

diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c
index 9df7126b19ee458897fa11ec531a87631f84babc..abc6a99d66b35d0792c6122c1d839a6b13caf1b2 100644 (file)
--- a/src/openvpn/tun.c
+++ b/src/openvpn/tun.c
@@ -30,6 +30,12 @@
  * from VTun by Maxim Krasnyansky <max_mk@yahoo.com>.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #include "tun.h"

diff --git a/src/openvpn/win32.c b/src/openvpn/win32.c
index 7639bad9af28a1109fdeaadc643fc0c96ad675ea..d7bf5145c830e357b56e6369b77650ea351ac5eb 100644 (file)
--- a/src/openvpn/win32.c
+++ b/src/openvpn/win32.c
@@ -26,6 +26,13 @@
  * Win32-specific OpenVPN code, targetted at the mingw
  * development environment.
  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #ifdef WIN32