[RPCSS]

* Move some inclusions to the main header.
* Remove inclusions and definitions that already exist in the main header.
* Remove one time winsvc.h inclusion from the main header and put them back where it belongs.
CORE-7716

svn path=/trunk/; revision=61605

diff --git a/reactos/base/services/rpcss/epmp.c b/reactos/base/services/rpcss/epmp.c
index aef5fde..5776cf6 100644 (file)
--- a/reactos/base/services/rpcss/epmp.c
+++ b/reactos/base/services/rpcss/epmp.c
@@ -18,10 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <epm_s.h>
+#include "rpcss.h"
 
 #include <wine/debug.h>
-#include <wine/list.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/base/services/rpcss/irotp.c b/reactos/base/services/rpcss/irotp.c
index 368dea6..bf9c569 100644 (file)
--- a/reactos/base/services/rpcss/irotp.c
+++ b/reactos/base/services/rpcss/irotp.c
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <irot_s.h>
-#include <wine/list.h>
+#include "rpcss.h"
+
 #include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(rpcss);

diff --git a/reactos/base/services/rpcss/rpcss.h b/reactos/base/services/rpcss/rpcss.h
index 67bbc52..347a5cf 100644 (file)
--- a/reactos/base/services/rpcss/rpcss.h
+++ b/reactos/base/services/rpcss/rpcss.h
@@ -22,9 +22,20 @@
 #define __WINE_RPCSS_H
 
 #include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
 #include <windef.h>
 #include <winbase.h>
-#include <winsvc.h>
 
+#include <irot_s.h>
+#include <epm_s.h>
+
+#include <wine/list.h>
 
 #endif /* __WINE_RPCSS_H */

diff --git a/reactos/base/services/rpcss/rpcss_main.c b/reactos/base/services/rpcss/rpcss_main.c
index f225502..de2a997 100644 (file)
--- a/reactos/base/services/rpcss/rpcss_main.c
+++ b/reactos/base/services/rpcss/rpcss_main.c
@@ -43,11 +43,7 @@
  *     role of rpcss.exe in wine.
  */
 
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
 #include "rpcss.h"
-#include <irot_s.h>
-#include <epm_s.h>
 
 #include <wine/debug.h>
 

diff --git a/reactos/base/services/rpcss/service_main.c b/reactos/base/services/rpcss/service_main.c
index 501e2a4..fbff5f6 100644 (file)
--- a/reactos/base/services/rpcss/service_main.c
+++ b/reactos/base/services/rpcss/service_main.c
@@ -9,6 +9,8 @@
 
 #include "rpcss.h"
 
+#include <winsvc.h>
+
 #define NDEBUG
 #include <debug.h>