build revolution

PATCH In review Alon Bar-Lev 3 participants 49 messages Feb 21, 2012 – Feb 27, 2012 Kbuild Page 2 of 2

lore

Share & tools

lore

Alon Bar-Lev

author

2012-02-21 01:22 UTC #48 lore raw

PATCH 35/35 build: move out config.h include from syshead

In reply to Alon Bar-Lev

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 <[email protected]...>

---
 src/openvpn/base64.c              |    6 ++++++
 src/openvpn/buffer.c              |    6 ++++++
 src/openvpn/clinat.c              |    6 ++++++
 src/openvpn/compat.c              |    6 ++++++
 src/openvpn/crypto.c              |    6 ++++++
 src/openvpn/crypto_openssl.c      |    6 ++++++
 src/openvpn/crypto_polarssl.c     |    6 ++++++
 src/openvpn/cryptoapi.c           |    6 ++++++
 src/openvpn/dhcp.c                |    6 ++++++
 src/openvpn/error.c               |    6 ++++++
 src/openvpn/event.c               |    6 ++++++
 src/openvpn/fdmisc.c              |    6 ++++++
 src/openvpn/forward.c             |    6 ++++++
 src/openvpn/fragment.c            |    6 ++++++
 src/openvpn/gremlin.c             |    6 ++++++
 src/openvpn/helper.c              |    6 ++++++
 src/openvpn/httpdigest.c          |    6 ++++++
 src/openvpn/init.c                |    6 ++++++
 src/openvpn/interval.c            |    6 ++++++
 src/openvpn/list.c                |    6 ++++++
 src/openvpn/lladdr.c              |    6 ++++++
 src/openvpn/lzo.c                 |    6 ++++++
 src/openvpn/manage.c              |    6 ++++++
 src/openvpn/mbuf.c                |    6 ++++++
 src/openvpn/misc.c                |    6 ++++++
 src/openvpn/mroute.c              |    6 ++++++
 src/openvpn/mss.c                 |    6 ++++++
 src/openvpn/mstats.c              |    6 ++++++
 src/openvpn/mtcp.c                |    6 ++++++
 src/openvpn/mtu.c                 |    6 ++++++
 src/openvpn/mudp.c                |    6 ++++++
 src/openvpn/multi.c               |    6 ++++++
 src/openvpn/ntlm.c                |    6 ++++++
 src/openvpn/occ.c                 |    6 ++++++
 src/openvpn/openvpn.c             |    6 ++++++
 src/openvpn/options.c             |    6 ++++++
 src/openvpn/otime.c               |    6 ++++++
 src/openvpn/packet_id.c           |    6 ++++++
 src/openvpn/perf.c                |    6 ++++++
 src/openvpn/pf.c                  |    6 ++++++
 src/openvpn/ping.c                |    6 ++++++
 src/openvpn/pkcs11.c              |    6 ++++++
 src/openvpn/pkcs11_openssl.c      |    6 ++++++
 src/openvpn/pkcs11_polarssl.c     |    6 ++++++
 src/openvpn/plugin.c              |    6 ++++++
 src/openvpn/pool.c                |    6 ++++++
 src/openvpn/proto.c               |    6 ++++++
 src/openvpn/proxy.c               |    6 ++++++
 src/openvpn/ps.c                  |    6 ++++++
 src/openvpn/push.c                |    6 ++++++
 src/openvpn/reliable.c            |    6 ++++++
 src/openvpn/route.c               |    6 ++++++
 src/openvpn/schedule.c            |    6 ++++++
 src/openvpn/session_id.c          |    6 ++++++
 src/openvpn/shaper.c              |    6 ++++++
 src/openvpn/sig.c                 |    6 ++++++
 src/openvpn/socket.c              |    6 ++++++
 src/openvpn/socks.c               |    6 ++++++
 src/openvpn/ssl.c                 |    6 ++++++
 src/openvpn/ssl_openssl.c         |    6 ++++++
 src/openvpn/ssl_polarssl.c        |    6 ++++++
 src/openvpn/ssl_verify.c          |    6 ++++++
 src/openvpn/ssl_verify_openssl.c  |    6 ++++++
 src/openvpn/ssl_verify_polarssl.c |    6 ++++++
 src/openvpn/status.c              |    6 ++++++
 src/openvpn/syshead.h             |    9 ---------
 src/openvpn/tun.c                 |    6 ++++++
 src/openvpn/win32.c               |    7 +++++++
 68 files changed, 403 insertions(+), 9 deletions(-)

src/openvpn/base64.c +6 -0

index 303d773..bb89aae 100644
@@ -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)

src/openvpn/buffer.c +6 -0

index 391085b..ad30223 100644
@@ -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"

src/openvpn/clinat.c +6 -0

index 8e85e22..af75fc9 100644
@@ -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)

src/openvpn/compat.c +6 -0

index 2b1098e..f2fa265 100644
@@ -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>

src/openvpn/crypto.c +6 -0

index 9e7fa87..2e2e5d7 100644
@@ -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

src/openvpn/crypto_openssl.c +6 -0

index 72b0c3c..4a3be1e 100644
@@ -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)

src/openvpn/crypto_polarssl.c +6 -0

index 7a7d9b0..0e6728c 100644
@@ -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)

src/openvpn/cryptoapi.c +6 -0

index a825126..3eb942f 100644
@@ -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

src/openvpn/dhcp.c +6 -0

index 280a4af..8d0b18a 100644
@@ -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"

src/openvpn/error.c +6 -0

index 3de5487..1f2dd86 100644
@@ -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"

src/openvpn/event.c +6 -0

index 51b17b3..26d9bcb 100644
@@ -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"

src/openvpn/fdmisc.c +6 -0

index 5be3c8b..8dc11b1 100644
@@ -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"

src/openvpn/forward.c +6 -0

index 5e1e2a6..e13b81a 100644
@@ -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"

src/openvpn/fragment.c +6 -0

index 5ef3a47..7ad1d61 100644
@@ -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

src/openvpn/gremlin.c +6 -0

index c7c0206..f0aa7f6 100644
@@ -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

src/openvpn/helper.c +6 -0

index 22ea652..d9eef03 100644
@@ -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"

src/openvpn/httpdigest.c +6 -0

index 5907637..8afa3d4 100644
@@ -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

src/openvpn/init.c +6 -0

index e71ebb0..d9bc9e7 100644
@@ -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"

src/openvpn/interval.c +6 -0

index 44d59d0..64494f1 100644
@@ -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"

src/openvpn/list.c +6 -0

index fb93d0a..ea6bd74 100644
@@ -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

src/openvpn/lladdr.c +6 -0

index fc01b63..57f447b 100644
@@ -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"

src/openvpn/lzo.c +6 -0

index 4becd4d..195b819 100644
@@ -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

src/openvpn/manage.c +6 -0

index e84a423..85c9aca 100644
@@ -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

src/openvpn/mbuf.c +6 -0

index 0f36d3c..82f2388 100644
@@ -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

src/openvpn/misc.c +6 -0

index 4891251..48a3b99 100644
@@ -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"

src/openvpn/mroute.c +6 -0

index 285b151..5b53571 100644
@@ -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

src/openvpn/mss.c +6 -0

index 660b62c..8981bad 100644
@@ -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"

src/openvpn/mstats.c +6 -0

index 2f29d94..b4b864b 100644
@@ -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)

src/openvpn/mtcp.c +6 -0

index 662cb9a..dc15f09 100644
@@ -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

src/openvpn/mtu.c +6 -0

index 494f939..13f3f6c 100644
@@ -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"

src/openvpn/mudp.c +6 -0

index 7648ec6..3468dab 100644
@@ -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

src/openvpn/multi.c +6 -0

index 65a834b..e79c6f1 100644
@@ -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

src/openvpn/ntlm.c +6 -0

index 217173f..3390bdd 100644
@@ -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

src/openvpn/occ.c +6 -0

index 2fdbff0..ff48706 100644
@@ -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

src/openvpn/openvpn.c +6 -0

index b2175a1..75c751d 100644
@@ -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"

src/openvpn/options.c +6 -0

index 52207b5..4c8f0c4 100644
@@ -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"

src/openvpn/otime.c +6 -0

index b295646..173573c 100644
@@ -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"

src/openvpn/packet_id.c +6 -0

index fceead9..186f074 100644
@@ -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

src/openvpn/perf.c +6 -0

index d9dbafc..910d171 100644
@@ -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"

src/openvpn/pf.c +6 -0

index 0ef839e..729792e 100644
@@ -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)

src/openvpn/ping.c +6 -0

index 191ad74..6dc0b4e 100644
@@ -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"

src/openvpn/pkcs11.c +6 -0

index 7c0b90a..2189208 100644
@@ -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)

src/openvpn/pkcs11_openssl.c +6 -0

index 4a14b7c..18651fd 100644
@@ -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)

src/openvpn/pkcs11_polarssl.c +6 -0

index 349c312..ecef4d3 100644
@@ -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)

src/openvpn/plugin.c +6 -0

index a975161..7ce2f5e 100644
@@ -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

src/openvpn/pool.c +6 -0

index 60dc520..28c26b4 100644
@@ -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"

src/openvpn/proto.c +6 -0

index 65a6b67..2cf8314 100644
@@ -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"

src/openvpn/proxy.c +6 -0

index 5e74af2..991e165 100644
@@ -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"

src/openvpn/ps.c +6 -0

index 182925b..a4e50e8 100644
@@ -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

src/openvpn/push.c +6 -0

index 8a8779d..8d7d23a 100644
@@ -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"

src/openvpn/reliable.c +6 -0

index 7c0bb54..763169e 100644
@@ -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)

src/openvpn/route.c +6 -0

index ca8f1da..bf7af63 100644
@@ -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"

src/openvpn/schedule.c +6 -0

index f0482ab..471330f 100644
@@ -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

src/openvpn/session_id.c +6 -0

index 7caf105..2e07b54 100644
@@ -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)

src/openvpn/shaper.c +6 -0

index 1a89fc2..6b445e2 100644
@@ -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"

src/openvpn/sig.c +6 -0

index 924a343..5b33652 100644
@@ -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"

src/openvpn/socket.c +6 -0

index 5c9ef99..ed2b300 100644
@@ -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"

src/openvpn/socks.c +6 -0

index 949d256..510c110 100644
@@ -30,6 +30,12 @@
  *   (Pierre Bourdon <[email protected]...>)
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #ifdef ENABLE_SOCKS

src/openvpn/ssl.c +6 -0

index caafd18..251f8ed 100644
@@ -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)

src/openvpn/ssl_openssl.c +6 -0

index 9a0c4d0..6a60cb5 100644
@@ -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)

src/openvpn/ssl_polarssl.c +6 -0

index e5bd8ca..c01ff8a 100644
@@ -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)

src/openvpn/ssl_verify.c +6 -0

index 0fa1137..51457f8 100644
@@ -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)

src/openvpn/ssl_verify_openssl.c +6 -0

index e647c2a..1ccfc60 100644
@@ -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)

src/openvpn/ssl_verify_polarssl.c +6 -0

index 249e687..53e6006 100644
@@ -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)

src/openvpn/status.c +6 -0

index 8fd89ef..0be5e4c 100644
@@ -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"

src/openvpn/syshead.h +0 -9

index eb73504..793ddd2 100644
@@ -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 */

src/openvpn/tun.c +6 -0

index 9df7126..abc6a99 100644
@@ -30,6 +30,12 @@
  * from VTun by Maxim Krasnyansky <[email protected]...>.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#elif defined(_MSC_VER)
+#include "config-msvc.h"
+#endif
+
 #include "syshead.h"
 
 #include "tun.h"

src/openvpn/win32.c +7 -0

index a2a007f..49f169a 100644
@@ -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

Signature · 1 line

1.7.3.4