From 2c95e0205de21f030692fdc1221f6414ff3fb202 Mon Sep 17 00:00:00 2001
From: Juan Lang <juan_lang@yahoo.com>
Date: Tue, 18 Jan 2005 11:40:24 +0000
Subject: [PATCH] Make netspi.h private, as some of its declarations conflict
 with npapi.h.  Spotted by Paul Vriens.

---
 {include => dlls/mpr}/netspi.h | 8 +++++---
 dlls/mpr/nps.c                 | 2 --
 include/Makefile.in            | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)
 rename {include => dlls/mpr}/netspi.h (94%)

diff --git a/include/netspi.h b/dlls/mpr/netspi.h
similarity index 94%
rename from include/netspi.h
rename to dlls/mpr/netspi.h
index ff1e996798f..7695584aec2 100644
--- a/include/netspi.h
+++ b/dlls/mpr/netspi.h
@@ -1,5 +1,8 @@
 /*
  * MPR - Network provider services
+ * Warning: this file apparently existed as part of the Win98 DDK.  Some of
+ * the declarations in it conflict with those in the Platform SDK's npapi.h,
+ * therefore this header was made private.  Don't try to include both headers.
  *
  * Copyright (C) 1999 Ulrich Weigand
  *
@@ -21,8 +24,8 @@
 #ifndef _NETSPI_H_
 #define _NETSPI_H_
 
-#include <windef.h>
-#include <winnetwk.h>
+#include "windef.h"
+#include "winnetwk.h"
 
 /*
  * Note: The Unicode variants of all these routines/structures
@@ -148,4 +151,3 @@ LPVOID WINAPI NPSNotifyGetContextA(NOTIFYCALLBACK);
 #define       NPSNotifyGetContext WINELIB_NAME_AW(NPSNotifyGetContext)
 
 #endif /* _NETSPI_H_ */
-
diff --git a/dlls/mpr/nps.c b/dlls/mpr/nps.c
index a4e478d94f1..7fe15565b89 100644
--- a/dlls/mpr/nps.c
+++ b/dlls/mpr/nps.c
@@ -26,7 +26,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
-#include "winnetwk.h"
 #include "netspi.h"
 #include "wine/debug.h"
 #include "winerror.h"
@@ -212,4 +211,3 @@ LPVOID WINAPI NPSNotifyGetContextA( NOTIFYCALLBACK pfNotifyCallBack )
     FIXME( "(%p): stub\n", pfNotifyCallBack );
     return NULL;
 }
-
diff --git a/include/Makefile.in b/include/Makefile.in
index db47cc2f4e2..2188cd398fc 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -163,7 +163,6 @@ WINDOWS_INCLUDES = \
 	mssip.h \
 	mswsock.h \
 	nb30.h \
-	netspi.h \
 	npapi.h \
 	nspapi.h \
 	ntddcdrm.h \