--- trunk/reactos/drivers/net/dd/ne2000/Makefile 2005-05-28 10:41:13 UTC (rev 15568)
+++ trunk/reactos/drivers/net/dd/ne2000/Makefile 2005-05-28 11:09:34 UTC (rev 15569)
@@ -6,7 +6,7 @@
TARGET_NAME = ne2000
-TARGET_CFLAGS = -I./include -Werror -Wall
+TARGET_CFLAGS = -I./include -D__USE_W32API -Werror -Wall
TARGET_OBJECTS = \
ne2000/8390.o \
--- trunk/reactos/drivers/net/dd/ne2000/include/ne2000.h 2005-05-28 10:41:13 UTC (rev 15568)
+++ trunk/reactos/drivers/net/dd/ne2000/include/ne2000.h 2005-05-28 11:09:34 UTC (rev 15569)
@@ -7,16 +7,7 @@
#ifndef __NE2000_H
#define __NE2000_H
-#ifdef _MSC_VER
-
-#ifndef ULONG_PTR
-#define ULONG ULONG_PTR
-#endif
-
-#include <ndis.h>
-#else
-#include <net/ndis.h>
-#endif
+#include <ddk/ndis.h>
#include <8390.h>
#include <debug.h>
--- trunk/reactos/drivers/net/dd/ne2000/ne2000/main.c 2005-05-28 10:41:13 UTC (rev 15568)
+++ trunk/reactos/drivers/net/dd/ne2000/ne2000/main.c 2005-05-28 11:09:34 UTC (rev 15569)
@@ -844,9 +844,9 @@
Miniport.QueryInformationHandler = MiniportQueryInformation;
Miniport.ReconfigureHandler = MiniportReconfigure;
Miniport.ResetHandler = MiniportReset;
- Miniport.u1.SendHandler = MiniportSend;
+ Miniport.SendHandler = MiniportSend;
Miniport.SetInformationHandler = MiniportSetInformation;
- Miniport.u2.TransferDataHandler = MiniportTransferData;
+ Miniport.TransferDataHandler = MiniportTransferData;
NdisMInitializeWrapper(&NdisWrapperHandle,
DriverObject,