diff options
| author | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2008-01-22 23:52:08 +0000 |
|---|---|---|
| committer | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2008-01-22 23:52:08 +0000 |
| commit | 44b3dcc8927c4bde391792a4632198cecba29f8d (patch) | |
| tree | 73be6943affe1bc08a0bdff8c1befa59af463b90 /tap-win32 | |
| parent | Incremented version number to 2.1_rc4a. (diff) | |
| download | openvpn-44b3dcc8927c4bde391792a4632198cecba29f8d.tar.xz | |
Upgraded TAP build scripts to use WDK 6001.17121
(Windows 2008 Server pre-RTM).
Fixed typo of DESC_SecPKCS11DLLs in openvpn.nsi.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@2651 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'tap-win32')
| -rwxr-xr-x | tap-win32/prototypes.h | 2 | ||||
| -rwxr-xr-x | tap-win32/tapdrvr.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tap-win32/prototypes.h b/tap-win32/prototypes.h index 788670c..f7d09f6 100755 --- a/tap-win32/prototypes.h +++ b/tap-win32/prototypes.h @@ -187,7 +187,7 @@ VOID HookDispatchFunctions(); #if ENABLE_NONADMIN -#if DDKVER < 5600 +#if DDKVER_MAJOR < 5600 /* * Better solution for use on Vista DDK, but possibly not compatible with * earlier DDKs: diff --git a/tap-win32/tapdrvr.c b/tap-win32/tapdrvr.c index 989b44c..ca02d13 100755 --- a/tap-win32/tapdrvr.c +++ b/tap-win32/tapdrvr.c @@ -40,8 +40,8 @@ //====================================================== #include "../../autodefs/defs.h" -#ifndef DDKVER -#error DDKVER must be defined to the DDK Version as in c:\WinDDK\[DDKVER]\... +#ifndef DDKVER_MAJOR +#error DDKVER_MAJOR must be defined as the major number of the DDK Version #endif #define NDIS_MINIPORT_DRIVER @@ -70,7 +70,7 @@ //======================================================== #define ENABLE_NONADMIN 1 -#if DDKVER < 5600 +#if DDKVER_MAJOR < 5600 #include <ndis.h> #include <ntstrsafe.h> #include <ntddk.h> @@ -419,7 +419,7 @@ NDIS_STATUS AdapterCreate } } } else { -#if DDKVER < 5600 +#if DDKVER_MAJOR < 5600 /* "MiniportName" is available only XP and above. Not on Windows 2000. */ NDIS_STRING key = NDIS_STRING_CONST("NdisVersion"); NdisReadConfiguration (&status, &parm, configHandle, &key, NdisParameterInteger); |