Commit in reactos/drivers/lib on MAIN
ip/transport/tcp/event.c+2-21.11 -> 1.12
                /tcp.c+3-21.15 -> 1.16
oskittcp/oskittcp/kern_clock.c+1-11.3 -> 1.4
+6-5
3 modified files
- Fix compilation errors with GCC 4.0-20041205.

reactos/drivers/lib/ip/transport/tcp
event.c 1.11 -> 1.12
diff -u -r1.11 -r1.12
--- event.c	4 Dec 2004 23:29:56 -0000	1.11
+++ event.c	13 Dec 2004 16:36:39 -0000	1.12
@@ -105,13 +105,13 @@
 void *TCPMalloc( void *ClientData,
 		 OSK_UINT Bytes, OSK_PCHAR File, OSK_UINT Line ) {
     void *v = PoolAllocateBuffer( Bytes );
-    if( v ) TrackWithTag( FOURCC('f','b','s','d'), v, File, Line );
+    if( v ) TrackWithTag( FOURCC('f','b','s','d'), v, (PCHAR)File, Line );
     return v;
 }
 
 void TCPFree( void *ClientData,
 	      void *data, OSK_PCHAR File, OSK_UINT Line ) {
-    UntrackFL( File, Line, data );
+    UntrackFL( (PCHAR)File, Line, data );
     PoolFreeBuffer( data );
 }
 

reactos/drivers/lib/ip/transport/tcp
tcp.c 1.15 -> 1.16
diff -u -r1.15 -r1.16
--- tcp.c	12 Dec 2004 11:48:03 -0000	1.15
+++ tcp.c	13 Dec 2004 16:36:39 -0000	1.16
@@ -552,7 +552,7 @@
   ULONG ReceiveFlags,
   PTCP_COMPLETION_ROUTINE Complete,
   PVOID Context ) {
-    PCHAR DataBuffer;
+    OSK_PCHAR DataBuffer;
     UINT DataLen, Received = 0;
     NTSTATUS Status;
     PTDI_BUCKET Bucket;
@@ -623,7 +623,8 @@
 			   Connection->SocketContext));
 
     Status = OskitTCPSend( Connection->SocketContext, 
-			   BufferData, PacketSize, (PUINT)DataUsed, 0 );
+			   (OSK_PCHAR)BufferData, PacketSize,
+			   (PUINT)DataUsed, 0 );
 
     TcpipRecursiveMutexLeave( &TCPLock );
 

reactos/drivers/lib/oskittcp/oskittcp
kern_clock.c 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- kern_clock.c	23 Sep 2004 03:02:29 -0000	1.3
+++ kern_clock.c	13 Dec 2004 16:36:39 -0000	1.4
@@ -85,7 +85,7 @@
 /* Exported to machdep.c. */
 struct callout *callfree, *callout;
 
-static struct callout calltodo;
+struct callout calltodo;
 
 long tk_cancc;
 long tk_nin;
CVSspam 0.2.8