system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-16 01:25:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make netspi.h private, as some of its declarations conflict with

Browse source 
npapi.h.  Spotted by Paul Vriens.
This commit is contained in:
Juan Lang 2005-01-18 11:40:24 +00:00 committed by Alexandre Julliard
parent cc8f18f96f
commit 2c95e0205d
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/netspi.h → dlls/mpr/netspi.h
View file

@ -1,5 +1,8 @@
/* /*
* MPR - Network provider services * 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 * Copyright (C) 1999 Ulrich Weigand
* *
@ -21,8 +24,8 @@
#ifndef _NETSPI_H_ #ifndef _NETSPI_H_
#define _NETSPI_H_ #define _NETSPI_H_
#include <windef.h> #include "windef.h"
#include <winnetwk.h> #include "winnetwk.h"
/* /*
* Note: The Unicode variants of all these routines/structures * Note: The Unicode variants of all these routines/structures
@ -148,4 +151,3 @@ LPVOID WINAPI NPSNotifyGetContextA(NOTIFYCALLBACK);
#define NPSNotifyGetContext WINELIB_NAME_AW(NPSNotifyGetContext) #define NPSNotifyGetContext WINELIB_NAME_AW(NPSNotifyGetContext)
#endif /* _NETSPI_H_ */ #endif /* _NETSPI_H_ */

2
dlls/mpr/nps.c
View file

@ -26,7 +26,6 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winuser.h" #include "winuser.h"
#include "winnetwk.h"
#include "netspi.h" #include "netspi.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "winerror.h" #include "winerror.h"
@ -212,4 +211,3 @@ LPVOID WINAPI NPSNotifyGetContextA( NOTIFYCALLBACK pfNotifyCallBack )
FIXME( "(%p): stub\n", pfNotifyCallBack ); FIXME( "(%p): stub\n", pfNotifyCallBack );
return NULL; return NULL;
} }

1
include/Makefile.in
View file

@ -163,7 +163,6 @@ WINDOWS_INCLUDES = \
mssip.h \ mssip.h \
mswsock.h \ mswsock.h \
nb30.h \ nb30.h \
netspi.h \
npapi.h \ npapi.h \
nspapi.h \ nspapi.h \
ntddcdrm.h \ ntddcdrm.h \