Modified: trunk/reactos/drivers/net/npf/Makefile
Modified: trunk/reactos/drivers/net/npf/dump.c
Modified: trunk/reactos/drivers/net/npf/jitter.c
Modified: trunk/reactos/drivers/net/npf/openclos.c
Modified: trunk/reactos/drivers/net/npf/packet.c
Modified: trunk/reactos/drivers/net/npf/packet.h
Modified: trunk/reactos/drivers/net/npf/read.c
Modified: trunk/reactos/drivers/net/npf/win_bpf.h
Modified: trunk/reactos/drivers/net/npf/write.c
--- trunk/reactos/drivers/net/npf/Makefile 2005-05-28 11:09:34 UTC (rev 15569)
+++ trunk/reactos/drivers/net/npf/Makefile 2005-05-28 11:09:53 UTC (rev 15570)
@@ -7,9 +7,9 @@
TARGET_NAME = npf
-#TARGET_CFLAGS = -DDBG -DWIN_NT_DRIVER -DKQPC_TS -I$(PATH_TO_TOP)/ntoskrnl/include
+#TARGET_CFLAGS = -D__USE_W32API -D_TIMEVAL_DEFINED -DDBG -DWIN_NT_DRIVER -DKQPC_TS -I$(PATH_TO_TOP)/ntoskrnl/include
-TARGET_CFLAGS = -DDBG -DWIN_NT_DRIVER -DKQPC_TS -DUSE_KLOCKS -I$(PATH_TO_TOP)/ntoskrnl/include -Wall -Werror
+TARGET_CFLAGS = -D__USE_W32API -D_TIMEVAL_DEFINED -DDBG -DWIN_NT_DRIVER -DKQPC_TS -DUSE_KLOCKS -I$(PATH_TO_TOP)/ntoskrnl/include -Wall -Werror
TARGET_DDKLIBS = ndis.a
--- trunk/reactos/drivers/net/npf/dump.c 2005-05-28 11:09:34 UTC (rev 15569)
+++ trunk/reactos/drivers/net/npf/dump.c 2005-05-28 11:09:53 UTC (rev 15570)
@@ -26,7 +26,7 @@
#include "ndis.h"
#else
#include <ddk/ntddk.h>
-#include <net/ndis.h>
+#include <ddk/ndis.h>
//#define PsGetCurrentProcess() IoGetCurrentProcess()
#ifndef PsGetCurrentThread
#define PsGetCurrentThread() ((PETHREAD) (KeGetCurrentThread()))
--- trunk/reactos/drivers/net/npf/jitter.c 2005-05-28 11:09:34 UTC (rev 15569)
+++ trunk/reactos/drivers/net/npf/jitter.c 2005-05-28 11:09:53 UTC (rev 15570)
@@ -26,7 +26,7 @@
#include "ndis.h"
#else
#include <ddk/ntddk.h>
-#include <net/ndis.h>
+#include <ddk/ndis.h>
#endif
#include "packet.h"
--- trunk/reactos/drivers/net/npf/openclos.c 2005-05-28 11:09:34 UTC (rev 15569)
+++ trunk/reactos/drivers/net/npf/openclos.c 2005-05-28 11:09:53 UTC (rev 15570)
@@ -25,7 +25,7 @@
#include "ndis.h"
#else
#include <ddk/ntddk.h>
-#include <net/ndis.h>
+#include <ddk/ndis.h>
#endif
#include "debug.h"
#include "packet.h"
--- trunk/reactos/drivers/net/npf/packet.c 2005-05-28 11:09:34 UTC (rev 15569)
+++ trunk/reactos/drivers/net/npf/packet.c 2005-05-28 11:09:53 UTC (rev 15570)
@@ -26,7 +26,7 @@
#include "ndis.h"
#else
#include <ddk/ntddk.h>
-#include <net/ndis.h>
+#include <ddk/ndis.h>
#endif
#include "ntddpack.h"
@@ -114,27 +114,14 @@
ProtocolChar.MajorNdisVersion = 3;
#endif
ProtocolChar.MinorNdisVersion = 0;
-#ifndef __GNUC__
ProtocolChar.Reserved = 0;
-#else
- ProtocolChar.u1.Reserved = 0;
-#endif
ProtocolChar.OpenAdapterCompleteHandler = NPF_OpenAdapterComplete;
ProtocolChar.CloseAdapterCompleteHandler = NPF_CloseAdapterComplete;
-#ifndef __GNUC__
ProtocolChar.SendCompleteHandler = NPF_SendComplete;
ProtocolChar.TransferDataCompleteHandler = NPF_TransferDataComplete;
-#else
- ProtocolChar.u2.SendCompleteHandler = NPF_SendComplete;
- ProtocolChar.u3.TransferDataCompleteHandler = NPF_TransferDataComplete;
-#endif
ProtocolChar.ResetCompleteHandler = NPF_ResetComplete;
ProtocolChar.RequestCompleteHandler = NPF_RequestComplete;
-#ifndef __GNUC__
ProtocolChar.ReceiveHandler = NPF_tap;
-#else
- ProtocolChar.u4.ReceiveHandler = NPF_tap;
-#endif
ProtocolChar.ReceiveCompleteHandler = NPF_ReceiveComplete;
ProtocolChar.StatusHandler = NPF_Status;
ProtocolChar.StatusCompleteHandler = NPF_StatusComplete;
--- trunk/reactos/drivers/net/npf/packet.h 2005-05-28 11:09:34 UTC (rev 15569)
+++ trunk/reactos/drivers/net/npf/packet.h 2005-05-28 11:09:53 UTC (rev 15570)
@@ -32,13 +32,9 @@
#define NTKERNEL ///< Forces the compilation of the jitter with kernel calls
-#ifdef __GNUC__
+struct bpf_insn;
#undef EXIT_SUCCESS
#undef EXIT_FAILURE
-#define UNICODE_NULL ((WCHAR)0) // winnt
-#include "win_bpf.h"
-#include <internal/ps.h>
-#endif
#include "jitter.h"
#include "tme.h"
--- trunk/reactos/drivers/net/npf/read.c 2005-05-28 11:09:34 UTC (rev 15569)
+++ trunk/reactos/drivers/net/npf/read.c 2005-05-28 11:09:53 UTC (rev 15570)
@@ -26,10 +26,8 @@
#include <ndis.h>
#else
#include <ddk/ntddk.h>
-#include <net/ndis.h>
+#include <ddk/ndis.h>
-#define NdisMoveMappedMemory(Destination,Source,Length) RtlCopyMemory(Destination,Source,Length)
-#define NdisZeroMappedMemory(Destination,Length) RtlZeroMemory(Destination,Length)
#define NdisReinitializePacket(Packet) \
{ \
(Packet)->Private.Head = (PNDIS_BUFFER)NULL; \
--- trunk/reactos/drivers/net/npf/win_bpf.h 2005-05-28 11:09:34 UTC (rev 15569)
+++ trunk/reactos/drivers/net/npf/win_bpf.h 2005-05-28 11:09:53 UTC (rev 15570)
@@ -47,7 +47,7 @@
typedef UCHAR u_char;
typedef USHORT u_short;
-typedef ULONG u_int;
+typedef UINT u_int;
typedef LONG bpf_int32;
typedef ULONG bpf_u_int32;
typedef ULONG u_int32;
--- trunk/reactos/drivers/net/npf/write.c 2005-05-28 11:09:34 UTC (rev 15569)
+++ trunk/reactos/drivers/net/npf/write.c 2005-05-28 11:09:53 UTC (rev 15570)
@@ -26,7 +26,7 @@
#include "ndis.h"
#else
#include <ddk/ntddk.h>
-#include <net/ndis.h>
+#include <ddk/ndis.h>
#define NdisReinitializePacket(Packet) \
{ \
(Packet)->Private.Head = (PNDIS_BUFFER)NULL; \