aboutsummaryrefslogtreecommitdiff
path: root/tap-win32/common.h
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2008-05-12 20:31:43 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2008-05-12 20:31:43 +0000
commit1bda73a7b0f45a2502ae93e33e30b98152d893f3 (patch)
tree7bdf8f59ec2c6443a071a0217f78f8a999596030 /tap-win32/common.h
parentMisc XGUI fixes. (diff)
downloadopenvpn-1bda73a7b0f45a2502ae93e33e30b98152d893f3.tar.xz
Moved branch into official BETA21 position.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@2959 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'tap-win32/common.h')
-rwxr-xr-xtap-win32/common.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/tap-win32/common.h b/tap-win32/common.h
index df2024d..93e4750 100755
--- a/tap-win32/common.h
+++ b/tap-win32/common.h
@@ -32,7 +32,15 @@
// common to both.
//===============================================
-#include "../autodefs/defs.h"
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#else
+#if defined(_MSC_VER) && !defined(TAP_DRIVER_MAJOR_VERSION)
+#include "config-win32.h"
+#else
+#include "../config.h"
+#endif
+#endif
//=============
// TAP IOCTLs
@@ -81,4 +89,4 @@
// simultaneously.
//=========================================================
-#define TAP_COMPONENT_ID PRODUCT_TAP_ID
+#define TAP_COMPONENT_ID TAP_ID