[akhaldi] 61605: [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 hea...

Author: akhaldi
Date: Mon Jan 13 12:47:43 2014
New Revision: 61605

URL: http://svn.reactos.org/svn/reactos?rev=61605&view=rev
Log:
[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

Modified:
    trunk/reactos/base/services/rpcss/epmp.c
    trunk/reactos/base/services/rpcss/irotp.c
    trunk/reactos/base/services/rpcss/rpcss.h
    trunk/reactos/base/services/rpcss/rpcss_main.c
    trunk/reactos/base/services/rpcss/service_main.c

Modified: trunk/reactos/base/services/rpcss/epmp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/epmp.c?...
==============================================================================
--- trunk/reactos/base/services/rpcss/epmp.c	[iso-8859-1] (original)
+++ trunk/reactos/base/services/rpcss/epmp.c	[iso-8859-1] Mon Jan 13 12:47:43 2014
@@ -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);

Modified: trunk/reactos/base/services/rpcss/irotp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/irotp.c...
==============================================================================
--- trunk/reactos/base/services/rpcss/irotp.c	[iso-8859-1] (original)
+++ trunk/reactos/base/services/rpcss/irotp.c	[iso-8859-1] Mon Jan 13 12:47:43 2014
@@ -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);

Modified: trunk/reactos/base/services/rpcss/rpcss.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss.h...
==============================================================================
--- trunk/reactos/base/services/rpcss/rpcss.h	[iso-8859-1] (original)
+++ trunk/reactos/base/services/rpcss/rpcss.h	[iso-8859-1] Mon Jan 13 12:47:43 2014
@@ -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 */

Modified: trunk/reactos/base/services/rpcss/rpcss_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss_m...
==============================================================================
--- trunk/reactos/base/services/rpcss/rpcss_main.c	[iso-8859-1] (original)
+++ trunk/reactos/base/services/rpcss/rpcss_main.c	[iso-8859-1] Mon Jan 13 12:47:43 2014
@@ -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>

Modified: trunk/reactos/base/services/rpcss/service_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/service...
==============================================================================
--- trunk/reactos/base/services/rpcss/service_main.c	[iso-8859-1] (original)
+++ trunk/reactos/base/services/rpcss/service_main.c	[iso-8859-1] Mon Jan 13 12:47:43 2014
@@ -8,6 +8,8 @@
  */

#include "rpcss.h"
+
+#include <winsvc.h>

#define NDEBUG
 #include <debug.h>