1. openvpn
  2. Commit c110b289eced4a792fd7c7c29e651b22f602fd24
Browse code

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>

Alon Bar-Lev authored on 2012/03/01 05:12:13
Showing 68 changed files
src/openvpn/base64.c
History View file @ c110b28
... ... 
@@ -31,6 +31,12 @@
31 31 
  * SUCH DAMAGE.
32 32 
  */
33 33
34 
+#ifdef HAVE_CONFIG_H
35 
+#include "config.h"
36 
+#elif defined(_MSC_VER)
37 
+#include "config-msvc.h"
38 
+#endif
39 
+
34 40 
 #include "syshead.h"
35 41
36 42 
 #if defined(ENABLE_HTTP_PROXY) || defined(ENABLE_PKCS11) || defined(ENABLE_CLIENT_CR) || defined(MANAGMENT_EXTERNAL_KEY)
src/openvpn/buffer.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #include "common.h"
src/openvpn/clinat.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #if defined(ENABLE_CLIENT_NAT)
src/openvpn/compat.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32 
 #include "compat.h"
27 33 
 #include <string.h>
src/openvpn/crypto.c
History View file @ c110b28
... ... 
@@ -23,6 +23,12 @@
23 23 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
24 24 
  */
25 25
26 
+#ifdef HAVE_CONFIG_H
27 
+#include "config.h"
28 
+#elif defined(_MSC_VER)
29 
+#include "config-msvc.h"
30 
+#endif
31 
+
26 32 
 #include "syshead.h"
27 33
28 34 
 #ifdef ENABLE_CRYPTO
src/openvpn/crypto_openssl.c
History View file @ c110b28
... ... 
@@ -27,6 +27,12 @@
27 27 
  * @file Data Channel Cryptography OpenSSL-specific backend interface
28 28 
  */
29 29
30 
+#ifdef HAVE_CONFIG_H
31 
+#include "config.h"
32 
+#elif defined(_MSC_VER)
33 
+#include "config-msvc.h"
34 
+#endif
35 
+
30 36 
 #include "syshead.h"
31 37
32 38 
 #if defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_OPENSSL)
src/openvpn/crypto_polarssl.c
History View file @ c110b28
... ... 
@@ -27,6 +27,12 @@
27 27 
  * @file Data Channel Cryptography PolarSSL-specific backend interface
28 28 
  */
29 29
30 
+#ifdef HAVE_CONFIG_H
31 
+#include "config.h"
32 
+#elif defined(_MSC_VER)
33 
+#include "config-msvc.h"
34 
+#endif
35 
+
30 36 
 #include "syshead.h"
31 37
32 38 
 #if defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_POLARSSL)
src/openvpn/cryptoapi.c
History View file @ c110b28
... ... 
@@ -28,6 +28,12 @@
28 28 
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 29 
  */
30 30
31 
+#ifdef HAVE_CONFIG_H
32 
+#include "config.h"
33 
+#elif defined(_MSC_VER)
34 
+#include "config-msvc.h"
35 
+#endif
36 
+
31 37 
 #include "syshead.h"
32 38
33 39 
 #ifdef ENABLE_CRYPTOAPI
src/openvpn/dhcp.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #include "dhcp.h"
src/openvpn/error.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #include "error.h"
src/openvpn/event.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #include "buffer.h"
src/openvpn/fdmisc.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #include "fdmisc.h"
src/openvpn/forward.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #include "forward.h"
src/openvpn/fragment.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #ifdef ENABLE_FRAGMENT
src/openvpn/gremlin.c
History View file @ c110b28
... ... 
@@ -27,6 +27,12 @@
27 27 
  * network outages when the --gremlin option is used.
28 28 
  */
29 29
30 
+#ifdef HAVE_CONFIG_H
31 
+#include "config.h"
32 
+#elif defined(_MSC_VER)
33 
+#include "config-msvc.h"
34 
+#endif
35 
+
30 36 
 #include "syshead.h"
31 37
32 38 
 #ifdef ENABLE_DEBUG
src/openvpn/helper.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #include "forward.h"
src/openvpn/httpdigest.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #if PROXY_DIGEST_AUTH
src/openvpn/init.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #include "win32.h"
src/openvpn/interval.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #include "interval.h"
src/openvpn/list.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #if P2MP_SERVER
src/openvpn/lladdr.c
History View file @ c110b28
... ... 
@@ -2,6 +2,12 @@
2 2 
  * Support routine for configuring link layer address
3 3 
  */
4 4
5 
+#ifdef HAVE_CONFIG_H
6 
+#include "config.h"
7 
+#elif defined(_MSC_VER)
8 
+#include "config-msvc.h"
9 
+#endif
10 
+
5 11 
 #include "syshead.h"
6 12 
 #include "error.h"
7 13 
 #include "misc.h"
src/openvpn/lzo.c
History View file @ c110b28
... ... 
@@ -26,6 +26,12 @@
26 26 
  * @file Data Channel Compression module function definitions.
27 27 
  */
28 28
29 
+#ifdef HAVE_CONFIG_H
30 
+#include "config.h"
31 
+#elif defined(_MSC_VER)
32 
+#include "config-msvc.h"
33 
+#endif
34 
+
29 35 
 #include "syshead.h"
30 36
31 37 
 #ifdef ENABLE_LZO
src/openvpn/manage.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #ifdef ENABLE_MANAGEMENT
src/openvpn/mbuf.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #if P2MP
src/openvpn/misc.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #include "buffer.h"
src/openvpn/mroute.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #if P2MP_SERVER
src/openvpn/mss.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32 
 #include "error.h"
27 33 
 #include "mss.h"
src/openvpn/mstats.c
History View file @ c110b28
... ... 
@@ -26,6 +26,12 @@
26 26 
  * Maintain usage stats in a memory-mapped file
27 27 
  */
28 28
29 
+#ifdef HAVE_CONFIG_H
30 
+#include "config.h"
31 
+#elif defined(_MSC_VER)
32 
+#include "config-msvc.h"
33 
+#endif
34 
+
29 35 
 #include "syshead.h"
30 36
31 37 
 #if defined(ENABLE_MEMSTATS)
src/openvpn/mtcp.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #if P2MP_SERVER
src/openvpn/mtu.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #include "common.h"
src/openvpn/mudp.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #if P2MP_SERVER
src/openvpn/multi.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #if P2MP_SERVER
src/openvpn/ntlm.c
History View file @ c110b28
... ... 
@@ -21,6 +21,12 @@
21 21 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
22 22 
  */
23 23
24 
+#ifdef HAVE_CONFIG_H
25 
+#include "config.h"
26 
+#elif defined(_MSC_VER)
27 
+#include "config-msvc.h"
28 
+#endif
29 
+
24 30 
 #include "syshead.h"
25 31
26 32 
 #if NTLM
src/openvpn/occ.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #ifdef ENABLE_OCC
src/openvpn/openvpn.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #include "init.h"
src/openvpn/options.c
History View file @ c110b28
... ... 
@@ -30,6 +30,12 @@
30 30 
  *   (Christof Meerwald, http://cmeerw.org)
31 31 
  */
32 32
33 
+#ifdef HAVE_CONFIG_H
34 
+#include "config.h"
35 
+#elif defined(_MSC_VER)
36 
+#include "config-msvc.h"
37 
+#endif
38 
+
33 39 
 #include "syshead.h"
34 40
35 41 
 #include "buffer.h"
src/openvpn/otime.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #include "otime.h"
src/openvpn/packet_id.c
History View file @ c110b28
... ... 
@@ -31,6 +31,12 @@
31 31 
  * to IPSec.
32 32 
  */
33 33
34 
+#ifdef HAVE_CONFIG_H
35 
+#include "config.h"
36 
+#elif defined(_MSC_VER)
37 
+#include "config-msvc.h"
38 
+#endif
39 
+
34 40 
 #include "syshead.h"
35 41
36 42 
 #ifdef ENABLE_CRYPTO
src/openvpn/perf.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #include "perf.h"
src/openvpn/pf.c
History View file @ c110b28
... ... 
@@ -24,6 +24,12 @@
24 24
25 25 
 /* packet filter functions */
26 26
27 
+#ifdef HAVE_CONFIG_H
28 
+#include "config.h"
29 
+#elif defined(_MSC_VER)
30 
+#include "config-msvc.h"
31 
+#endif
32 
+
27 33 
 #include "syshead.h"
28 34
29 35 
 #if defined(ENABLE_PF)
src/openvpn/ping.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #include "ping.h"
src/openvpn/pkcs11.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #if defined(ENABLE_PKCS11)
src/openvpn/pkcs11_openssl.c
History View file @ c110b28
... ... 
@@ -27,6 +27,12 @@
27 27 
  * @file PKCS #11 OpenSSL backend
28 28 
  */
29 29
30 
+#ifdef HAVE_CONFIG_H
31 
+#include "config.h"
32 
+#elif defined(_MSC_VER)
33 
+#include "config-msvc.h"
34 
+#endif
35 
+
30 36 
 #include "syshead.h"
31 37
32 38 
 #if defined(ENABLE_PKCS11) && defined(ENABLE_CRYPTO_OPENSSL)
src/openvpn/pkcs11_polarssl.c
History View file @ c110b28
... ... 
@@ -27,6 +27,12 @@
27 27 
  * @file PKCS #11 PolarSSL backend
28 28 
  */
29 29
30 
+#ifdef HAVE_CONFIG_H
31 
+#include "config.h"
32 
+#elif defined(_MSC_VER)
33 
+#include "config-msvc.h"
34 
+#endif
35 
+
30 36 
 #include "syshead.h"
31 37
32 38 
 #if defined(ENABLE_PKCS11) && defined(ENABLE_CRYPTO_POLARSSL)
src/openvpn/plugin.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #ifdef ENABLE_PLUGIN
src/openvpn/pool.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #include "pool.h"
src/openvpn/proto.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #include "proto.h"
src/openvpn/proxy.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #include "common.h"
src/openvpn/ps.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #if PORT_SHARE
src/openvpn/push.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #include "push.h"
src/openvpn/reliable.c
History View file @ c110b28
... ... 
@@ -27,6 +27,12 @@
27 27 
  * so that SSL/TLS can be run over UDP.
28 28 
  */
29 29
30 
+#ifdef HAVE_CONFIG_H
31 
+#include "config.h"
32 
+#elif defined(_MSC_VER)
33 
+#include "config-msvc.h"
34 
+#endif
35 
+
30 36 
 #include "syshead.h"
31 37
32 38 
 #if defined(ENABLE_CRYPTO) && defined(ENABLE_SSL)
src/openvpn/route.c
History View file @ c110b28
... ... 
@@ -26,6 +26,12 @@
26 26 
  * Support routines for adding/deleting network routes.
27 27 
  */
28 28
29 
+#ifdef HAVE_CONFIG_H
30 
+#include "config.h"
31 
+#elif defined(_MSC_VER)
32 
+#include "config-msvc.h"
33 
+#endif
34 
+
29 35 
 #include "syshead.h"
30 36
31 37 
 #include "common.h"
src/openvpn/schedule.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #if P2MP_SERVER
src/openvpn/session_id.c
History View file @ c110b28
... ... 
@@ -31,6 +31,12 @@
31 31 
  * it is called the key_id and is currently 2 bits long.
32 32 
  */
33 33
34 
+#ifdef HAVE_CONFIG_H
35 
+#include "config.h"
36 
+#elif defined(_MSC_VER)
37 
+#include "config-msvc.h"
38 
+#endif
39 
+
34 40 
 #include "syshead.h"
35 41
36 42 
 #if defined(ENABLE_CRYPTO) && defined(ENABLE_SSL)
src/openvpn/shaper.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32 
 #include "shaper.h"
27 33 
 #include "memdbg.h"
src/openvpn/sig.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #include "buffer.h"
src/openvpn/socket.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #include "socket.h"
src/openvpn/socks.c
History View file @ c110b28
... ... 
@@ -30,6 +30,12 @@
30 30 
  *   (Pierre Bourdon <delroth@gmail.com>)
31 31 
  */
32 32
33 
+#ifdef HAVE_CONFIG_H
34 
+#include "config.h"
35 
+#elif defined(_MSC_VER)
36 
+#include "config-msvc.h"
37 
+#endif
38 
+
33 39 
 #include "syshead.h"
34 40
35 41 
 #ifdef ENABLE_SOCKS
src/openvpn/ssl.c
History View file @ c110b28
... ... 
@@ -39,6 +39,12 @@
39 39 
  * over the same TCP/UDP port.
40 40 
  */
41 41
42 
+#ifdef HAVE_CONFIG_H
43 
+#include "config.h"
44 
+#elif defined(_MSC_VER)
45 
+#include "config-msvc.h"
46 
+#endif
47 
+
42 48 
 #include "syshead.h"
43 49
44 50 
 #if defined(ENABLE_CRYPTO) && defined(ENABLE_SSL)
src/openvpn/ssl_openssl.c
History View file @ c110b28
... ... 
@@ -27,6 +27,12 @@
27 27 
  * @file Control Channel OpenSSL Backend
28 28 
  */
29 29
30 
+#ifdef HAVE_CONFIG_H
31 
+#include "config.h"
32 
+#elif defined(_MSC_VER)
33 
+#include "config-msvc.h"
34 
+#endif
35 
+
30 36 
 #include "syshead.h"
31 37
32 38 
 #if defined(ENABLE_SSL) && defined(ENABLE_CRYPTO_OPENSSL)
src/openvpn/ssl_polarssl.c
History View file @ c110b28
... ... 
@@ -27,6 +27,12 @@
27 27 
  * @file Control Channel PolarSSL Backend
28 28 
  */
29 29
30 
+#ifdef HAVE_CONFIG_H
31 
+#include "config.h"
32 
+#elif defined(_MSC_VER)
33 
+#include "config-msvc.h"
34 
+#endif
35 
+
30 36 
 #include "syshead.h"
31 37
32 38 
 #if defined(ENABLE_SSL) && defined(ENABLE_CRYPTO_POLARSSL)
src/openvpn/ssl_verify.c
History View file @ c110b28
... ... 
@@ -27,6 +27,12 @@
27 27 
  * @file Control Channel Verification Module
28 28 
  */
29 29
30 
+#ifdef HAVE_CONFIG_H
31 
+#include "config.h"
32 
+#elif defined(_MSC_VER)
33 
+#include "config-msvc.h"
34 
+#endif
35 
+
30 36 
 #include "syshead.h"
31 37
32 38 
 #if defined(ENABLE_CRYPTO) && defined(ENABLE_SSL)
src/openvpn/ssl_verify_openssl.c
History View file @ c110b28
... ... 
@@ -27,6 +27,12 @@
27 27 
  * @file Control Channel Verification Module OpenSSL implementation
28 28 
  */
29 29
30 
+#ifdef HAVE_CONFIG_H
31 
+#include "config.h"
32 
+#elif defined(_MSC_VER)
33 
+#include "config-msvc.h"
34 
+#endif
35 
+
30 36 
 #include "syshead.h"
31 37
32 38 
 #if defined(ENABLE_SSL) && defined(ENABLE_CRYPTO_OPENSSL)
src/openvpn/ssl_verify_polarssl.c
History View file @ c110b28
... ... 
@@ -27,6 +27,12 @@
27 27 
  * @file Control Channel Verification Module PolarSSL backend
28 28 
  */
29 29
30 
+#ifdef HAVE_CONFIG_H
31 
+#include "config.h"
32 
+#elif defined(_MSC_VER)
33 
+#include "config-msvc.h"
34 
+#endif
35 
+
30 36 
 #include "syshead.h"
31 37
32 38 
 #if defined(ENABLE_SSL) && defined(ENABLE_CRYPTO_POLARSSL)
src/openvpn/status.c
History View file @ c110b28
... ... 
@@ -22,6 +22,12 @@
22 22 
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23 23 
  */
24 24
25 
+#ifdef HAVE_CONFIG_H
26 
+#include "config.h"
27 
+#elif defined(_MSC_VER)
28 
+#include "config-msvc.h"
29 
+#endif
30 
+
25 31 
 #include "syshead.h"
26 32
27 33 
 #include "status.h"
src/openvpn/syshead.h
History View file @ c110b28
... ... 
@@ -25,15 +25,6 @@
25 25 
 #ifndef SYSHEAD_H
26 26 
 #define SYSHEAD_H
27 27
28 
-/*
29 
- * Only include if not during configure
30 
- */
31 
-#ifdef HAVE_CONFIG_H
32 
-#include "config.h"
33 
-#elif defined(_MSC_VER)
34 
-#include "config-msvc.h"
35 
-#endif
36 
-
37 28 
 #include "compat.h"
38 29
39 30 
 /* branch prediction hints */
src/openvpn/tun.c
History View file @ c110b28
... ... 
@@ -30,6 +30,12 @@
30 30 
  * from VTun by Maxim Krasnyansky <max_mk@yahoo.com>.
31 31 
  */
32 32
33 
+#ifdef HAVE_CONFIG_H
34 
+#include "config.h"
35 
+#elif defined(_MSC_VER)
36 
+#include "config-msvc.h"
37 
+#endif
38 
+
33 39 
 #include "syshead.h"
34 40
35 41 
 #include "tun.h"
src/openvpn/win32.c
History View file @ c110b28
... ... 
@@ -26,6 +26,13 @@
26 26 
  * Win32-specific OpenVPN code, targetted at the mingw
27 27 
  * development environment.
28 28 
  */
29 
+
30 
+#ifdef HAVE_CONFIG_H
31 
+#include "config.h"
32 
+#elif defined(_MSC_VER)
33 
+#include "config-msvc.h"
34 
+#endif
35 
+
29 36 
 #include "syshead.h"
30 37
31 38 
 #ifdef WIN32