- Fix compilation errors with GCC 4.0-20041212.

svn path=/trunk/; revision=12230

diff --git a/reactos/drivers/net/tcpip/tcpip/dispatch.c b/reactos/drivers/net/tcpip/tcpip/dispatch.c
index 78589a3..7c42bac 100644 (file)
--- a/reactos/drivers/net/tcpip/tcpip/dispatch.c
+++ b/reactos/drivers/net/tcpip/tcpip/dispatch.c
@@ -1049,7 +1049,7 @@ VOID DispTdiQueryInformationExComplete(
         Count = CopyBufferToBufferChain(
             QueryContext->InputMdl,
             FIELD_OFFSET(TCP_REQUEST_QUERY_INFORMATION_EX, Context),
-            (PUCHAR)&QueryContext->QueryInfo.Context,
+            (PCHAR)&QueryContext->QueryInfo.Context,
             CONTEXT_SIZE);
     }
 

diff --git a/reactos/drivers/net/tcpip/tcpip/info.c b/reactos/drivers/net/tcpip/tcpip/info.c
index d095123..fa009f6 100644 (file)
--- a/reactos/drivers/net/tcpip/tcpip/info.c
+++ b/reactos/drivers/net/tcpip/tcpip/info.c
@@ -19,7 +19,7 @@ TDI_STATUS InfoCopyOut( PCHAR DataOut, UINT SizeOut,
     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 @@ TDI_STATUS InfoTdiQueryListEntities(PNDIS_BUFFER Buffer,
     for( Count = 0; Count < EntityCount; Count++ ) {
        CopyBufferToBufferChain(Buffer, 
                                Count * sizeof(TDIEntityID), 
-                               (PUCHAR)&EntityList[Count], 
+                               (PCHAR)&EntityList[Count], 
                                sizeof(TDIEntityID));
     }
     

diff --git a/reactos/drivers/net/tcpip/tcpip/ninfo.c b/reactos/drivers/net/tcpip/tcpip/ninfo.c
index 06851aa..7fab2c1 100644 (file)
--- a/reactos/drivers/net/tcpip/tcpip/ninfo.c
+++ b/reactos/drivers/net/tcpip/tcpip/ninfo.c
@@ -220,7 +220,7 @@ TDI_STATUS InfoNetworkLayerTdiSetEx( UINT InfoClass,
 
     TI_DbgPrint(MID_TRACE,("Called\n"));
 
-    OskitDumpBuffer( Buffer, BufferSize );
+    OskitDumpBuffer( (OSK_PCHAR)Buffer, BufferSize );
 
     if( InfoClass == INFO_CLASS_PROTOCOL &&
        InfoType == INFO_TYPE_PROVIDER &&

diff --git a/reactos/lib/rosrtl/misc/devmode.c b/reactos/lib/rosrtl/misc/devmode.c
index 0baf0b9..5845f12 100644 (file)
--- a/reactos/lib/rosrtl/misc/devmode.c
+++ b/reactos/lib/rosrtl/misc/devmode.c
@@ -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 @@ RosRtlDevModeA2W ( LPDEVMODEW pW, const LPDEVMODEA pA )
 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 );

diff --git a/reactos/tools/rsym.c b/reactos/tools/rsym.c
index b9e7dbb..9b0ba1f 100644 (file)
--- a/reactos/tools/rsym.c
+++ b/reactos/tools/rsym.c
@@ -246,7 +246,7 @@ int main(int argc, char* argv[])
   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 @@ int main(int argc, char* argv[])
            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);