[ros-diffs] [weiden] 25571: - Allow warnings in the expat library - More fixes for GCC4.2

Author: weiden
Date: Mon Jan 22 01:42:44 2007
New Revision: 25571

URL: http://svn.reactos.org/svn/reactos?rev=25571&view=rev
Log:
- Allow warnings in the expat library
- More fixes for GCC4.2

Modified:
    trunk/reactos/dll/win32/advapi32/sec/sid.c
    trunk/reactos/dll/win32/advapi32/service/sctrl.c
    trunk/reactos/lib/3rdparty/expat/expat.rbuild

Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/sec/sid.c (original)
+++ trunk/reactos/dll/win32/advapi32/sec/sid.c Mon Jan 22 01:42:44 2007
@@ -1111,7 +1111,7 @@
 
     for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++)
         if (WellKnownSids[i].Type == WellKnownSidType)
-            if (EqualSid(pSid, (PSID)&(WellKnownSids[i].Sid.Revision)))
+            if (EqualSid(pSid, (PSID)((ULONG_PTR)&WellKnownSids[i].Sid.Revision)))
                 return TRUE;
 
     return FALSE;

Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/service/sctrl.c (original)
+++ trunk/reactos/dll/win32/advapi32/service/sctrl.c Mon Jan 22 01:42:44 2007
@@ -47,7 +47,7 @@
 /* FUNCTIONS *****************************************************************/
 
 static PACTIVE_SERVICE
-ScLookupServiceByServiceName(LPWSTR lpServiceName)
+ScLookupServiceByServiceName(LPCWSTR lpServiceName)
 {
     DWORD i;
 
@@ -441,7 +441,7 @@
 {
     PACTIVE_SERVICE Service;
 
-    Service = ScLookupServiceByServiceName((LPWSTR)lpServiceName);
+    Service = ScLookupServiceByServiceName(lpServiceName);
     if (Service == NULL)
     {
         return (SERVICE_STATUS_HANDLE)NULL;

Modified: trunk/reactos/lib/3rdparty/expat/expat.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/expat/expat.r…
==============================================================================
--- trunk/reactos/lib/3rdparty/expat/expat.rbuild (original)
+++ trunk/reactos/lib/3rdparty/expat/expat.rbuild Mon Jan 22 01:42:44 2007
@@ -1,4 +1,4 @@
-<module name="expat" type="staticlibrary">
+<module name="expat" type="staticlibrary"
allowwarnings="true">
 	<include base="expat">.</include>
 	<include base="expat">lib</include>
 	<include base="ReactOS">include/reactos/libs/expat</include>