[ros-diffs] [ion] 16183: Build services with NDK

[ion at svn.reactos.com]

Build services with NDK
Modified: trunk/reactos/subsys/system/services/database.c
Modified: trunk/reactos/subsys/system/services/rpcserver.c
Modified: trunk/reactos/subsys/system/services/services.c
Modified: trunk/reactos/subsys/system/services/services.h
  _____  

Modified: trunk/reactos/subsys/system/services/database.c
--- trunk/reactos/subsys/system/services/database.c	2005-06-20
21:03:51 UTC (rev 16182)
+++ trunk/reactos/subsys/system/services/database.c	2005-06-20
21:04:03 UTC (rev 16183)
@@ -25,16 +25,11 @@

 
 /* INCLUDES
*****************************************************************/
 
-#define NTOS_MODE_USER
-#include <ntos.h>
-#include <rosrtl/string.h>
-
-#include <windows.h>
-#include <tchar.h>
-
-#include <services/services.h>
 #include "services.h"
+#include <services/services.h>
 
+#include <rosrtl/string.h>
+
 #define NDEBUG
 #include <debug.h>
 
  _____  

Modified: trunk/reactos/subsys/system/services/rpcserver.c
--- trunk/reactos/subsys/system/services/rpcserver.c	2005-06-20
21:03:51 UTC (rev 16182)
+++ trunk/reactos/subsys/system/services/rpcserver.c	2005-06-20
21:04:03 UTC (rev 16183)
@@ -4,11 +4,6 @@

 
 /* INCLUDES
****************************************************************/
 
-#define NTOS_MODE_USER
-#include <ntos.h>
-#include <stdio.h>
-#include <windows.h>
-
 #include "services.h"
 #include "svcctl_s.h"
 
  _____  

Modified: trunk/reactos/subsys/system/services/services.c
--- trunk/reactos/subsys/system/services/services.c	2005-06-20
21:03:51 UTC (rev 16182)
+++ trunk/reactos/subsys/system/services/services.c	2005-06-20
21:04:03 UTC (rev 16183)
@@ -29,12 +29,6 @@

 
 /* INCLUDES
*****************************************************************/
 
-#define NTOS_MODE_USER
-#include <ntos.h>
-#include <stdio.h>
-#include <tchar.h>
-#include <windows.h>
-
 #include "services.h"
 
 #define NDEBUG
@@ -74,14 +68,14 @@
   hEvent = CreateEvent(NULL,
                        TRUE,
                        FALSE,
-                       _T("SvcctrlStartEvent_A3725DX"));
+                       TEXT("SvcctrlStartEvent_A3725DX"));
   if (hEvent == NULL)
   {
     if (GetLastError() == ERROR_ALREADY_EXISTS)
     {
       hEvent = OpenEvent(EVENT_ALL_ACCESS,
                          FALSE,
-                         _T("SvcctrlStartEvent_A3725DX"));
+                         TEXT("SvcctrlStartEvent_A3725DX"));
       if (hEvent == NULL)
       {
         return FALSE;
@@ -166,7 +160,7 @@
 
     DPRINT("ScmCreateNamedPipe() -
CreateNamedPipe(\"\\\\.\\pipe\\Ntsvcs\")\n");
 
-    hPipe = CreateNamedPipe(_T("\\\\.\\pipe\\Ntsvcs"),
+    hPipe = CreateNamedPipe(TEXT("\\\\.\\pipe\\Ntsvcs"),
               PIPE_ACCESS_DUPLEX,
               PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT,
               PIPE_UNLIMITED_INSTANCES,
  _____  

Modified: trunk/reactos/subsys/system/services/services.h
--- trunk/reactos/subsys/system/services/services.h	2005-06-20
21:03:51 UTC (rev 16182)
+++ trunk/reactos/subsys/system/services/services.h	2005-06-20
21:04:03 UTC (rev 16183)
@@ -1,3 +1,7 @@

+#include <windows.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
+
 /*
  * services.h
  */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20050620/36cbc25c/attachment.html