From ea9913784342e1678599141aefab01c569ae58b7 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 23 Jan 2014 17:57:47 +0000 Subject: [PATCH] [MPR] * Move mprres.h inclusion to the main header. CORE-7716 svn path=/trunk/; revision=61779 --- reactos/dll/win32/mpr/mpr_main.c | 1 + reactos/dll/win32/mpr/mprres.h | 1 + reactos/dll/win32/mpr/nps.c | 1 - reactos/dll/win32/mpr/precomp.h | 3 +++ reactos/dll/win32/mpr/wnet.c | 2 -- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/reactos/dll/win32/mpr/mpr_main.c b/reactos/dll/win32/mpr/mpr_main.c index e319a0d59d5..f6ca1021b23 100644 --- a/reactos/dll/win32/mpr/mpr_main.c +++ b/reactos/dll/win32/mpr/mpr_main.c @@ -19,6 +19,7 @@ */ #include "precomp.h" + #include "wnetpriv.h" /* diff --git a/reactos/dll/win32/mpr/mprres.h b/reactos/dll/win32/mpr/mprres.h index 292b4765260..83e95450a6e 100644 --- a/reactos/dll/win32/mpr/mprres.h +++ b/reactos/dll/win32/mpr/mprres.h @@ -15,6 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #ifndef __WINE_MPRRES_H__ #define __WINE_MPRRES_H__ diff --git a/reactos/dll/win32/mpr/nps.c b/reactos/dll/win32/mpr/nps.c index 7137425997e..bb1264635aa 100644 --- a/reactos/dll/win32/mpr/nps.c +++ b/reactos/dll/win32/mpr/nps.c @@ -22,7 +22,6 @@ #include "precomp.h" #include "netspi.h" -#include "mprres.h" /*********************************************************************** * NPS_ProxyPasswordDialog diff --git a/reactos/dll/win32/mpr/precomp.h b/reactos/dll/win32/mpr/precomp.h index bdda98b7c2c..6d5a884c54b 100644 --- a/reactos/dll/win32/mpr/precomp.h +++ b/reactos/dll/win32/mpr/precomp.h @@ -13,6 +13,9 @@ #include #include + +#include "mprres.h" + WINE_DEFAULT_DEBUG_CHANNEL(mpr); #endif /* _MPR_PCH_ */ diff --git a/reactos/dll/win32/mpr/wnet.c b/reactos/dll/win32/mpr/wnet.c index 16d23aa739e..712c87a35a9 100644 --- a/reactos/dll/win32/mpr/wnet.c +++ b/reactos/dll/win32/mpr/wnet.c @@ -28,8 +28,6 @@ #include #include -#include "mprres.h" - /* Data structures representing network service providers. Assumes only one * thread creates them, and that they are constant for the life of the process * (and therefore doesn't synchronize access).