Commit in reactos on MAIN
drivers/net/tcpip/tcpip/dispatch.c+1-11.31 -> 1.32
                       /info.c+2-21.11 -> 1.12
                       /ninfo.c+1-11.9 -> 1.10
lib/rosrtl/misc/devmode.c+2-21.4 -> 1.5
tools/rsym.c+2-21.6 -> 1.7
+8-8
5 modified files
- Fix compilation errors with GCC 4.0-20041212.

reactos/drivers/net/tcpip/tcpip
dispatch.c 1.31 -> 1.32
diff -u -r1.31 -r1.32
--- dispatch.c	11 Dec 2004 14:59:32 -0000	1.31
+++ dispatch.c	19 Dec 2004 19:35:04 -0000	1.32
@@ -1049,7 +1049,7 @@
         Count = CopyBufferToBufferChain(
             QueryContext->InputMdl,
             FIELD_OFFSET(TCP_REQUEST_QUERY_INFORMATION_EX, Context),
-            (PUCHAR)&QueryContext->QueryInfo.Context,
+            (PCHAR)&QueryContext->QueryInfo.Context,
             CONTEXT_SIZE);
     }
 

reactos/drivers/net/tcpip/tcpip
info.c 1.11 -> 1.12
diff -u -r1.11 -r1.12
--- info.c	26 Nov 2004 06:55:17 -0000	1.11
+++ info.c	19 Dec 2004 19:35:04 -0000	1.12
@@ -19,7 +19,7 @@
     if( RememberedCBSize < SizeOut )
 	return TDI_BUFFER_TOO_SMALL;
     else {
-	CopyBufferToBufferChain( ClientBuf, 0, (PUCHAR)DataOut, SizeOut );
+	CopyBufferToBufferChain( ClientBuf, 0, (PCHAR)DataOut, SizeOut );
 	return TDI_SUCCESS;
     }
 }
@@ -99,7 +99,7 @@
     for( Count = 0; Count < EntityCount; Count++ ) {
 	CopyBufferToBufferChain(Buffer, 
 				Count * sizeof(TDIEntityID), 
-				(PUCHAR)&EntityList[Count], 
+				(PCHAR)&EntityList[Count], 
 				sizeof(TDIEntityID));
     }
     

reactos/drivers/net/tcpip/tcpip
ninfo.c 1.9 -> 1.10
diff -u -r1.9 -r1.10
--- ninfo.c	26 Nov 2004 06:55:17 -0000	1.9
+++ ninfo.c	19 Dec 2004 19:35:04 -0000	1.10
@@ -220,7 +220,7 @@
 
     TI_DbgPrint(MID_TRACE,("Called\n"));
 
-    OskitDumpBuffer( Buffer, BufferSize );
+    OskitDumpBuffer( (OSK_PCHAR)Buffer, BufferSize );
 
     if( InfoClass == INFO_CLASS_PROTOCOL &&
 	InfoType == INFO_TYPE_PROVIDER &&

reactos/lib/rosrtl/misc
devmode.c 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- devmode.c	18 Jul 2004 00:30:08 -0000	1.4
+++ devmode.c	19 Dec 2004 19:35:04 -0000	1.5
@@ -12,7 +12,7 @@
 void
 RosRtlDevModeA2W ( LPDEVMODEW pW, const LPDEVMODEA pA )
 {
-#define COPYS(f,len) MultiByteToWideChar ( CP_THREAD_ACP, 0, pA->f, len, pW->f, len )
+#define COPYS(f,len) MultiByteToWideChar ( CP_THREAD_ACP, 0, (LPSTR)pA->f, len, pW->f, len )
 #define COPYN(f) pW->f = pA->f
   memset ( pW, 0, sizeof(DEVMODEW) );
   COPYS(dmDeviceName, CCHDEVICENAME );
@@ -78,7 +78,7 @@
 void
 RosRtlDevModeW2A( LPDEVMODEA pA, const LPDEVMODEW pW )
 {
-#define COPYS(f,len) WideCharToMultiByte( CP_THREAD_ACP, 0, pW->f, len, pA->f, len, NULL, NULL )
+#define COPYS(f,len) WideCharToMultiByte( CP_THREAD_ACP, 0, pW->f, len, (LPSTR)pA->f, len, NULL, NULL )
 #define COPYN(f) pA->f = pW->f
   memset ( pA, 0, sizeof(DEVMODEA) );
   COPYS(dmDeviceName, CCHDEVICENAME );

reactos/tools
rsym.c 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- rsym.c	15 Dec 2004 02:24:35 -0000	1.6
+++ rsym.c	19 Dec 2004 19:35:05 -0000	1.7
@@ -246,7 +246,7 @@
   for (Idx = 0; Idx < PEFileHeader.NumberOfSections; Idx++)
     {
       //printf("section: '%.08s'\n", PESectionHeaders[Idx].Name);
-      if ((strncmp(PESectionHeaders[Idx].Name, ".stab", 5) == 0)
+      if ((strncmp((char*)PESectionHeaders[Idx].Name, ".stab", 5) == 0)
         && (PESectionHeaders[Idx].Name[5] == 0))
         {
 	   //printf(".stab section found. Size %d\n",
@@ -259,7 +259,7 @@
            n_in = fread(SymbolsBase, 1, SymbolsLength, in);
         }
 
-      if (strncmp(PESectionHeaders[Idx].Name, ".stabstr", 8) == 0)
+      if (strncmp((char*)PESectionHeaders[Idx].Name, ".stabstr", 8) == 0)
         {
 	   //printf(".stabstr section found. Size %d\n",
            //  PESectionHeaders[Idx].SizeOfRawData);
CVSspam 0.2.8