[gvg] 17668: Sync to Wine-20050830:

Sync to Wine-20050830:
Mike McCormack <mike(a)codeweavers.com>
- gcc 4.0 warning fixes.
Modified: trunk/reactos/lib/icmp/icmp.spec
Modified: trunk/reactos/lib/icmp/icmp_main.c
  _____  

Modified: trunk/reactos/lib/icmp/icmp.spec
--- trunk/reactos/lib/icmp/icmp.spec	2005-09-05 21:06:55 UTC (rev
17667)
+++ trunk/reactos/lib/icmp/icmp.spec	2005-09-05 21:08:24 UTC (rev
17668)
@@ -1,8 +1,8 @@

-@ stdcall IcmpCloseHandle(ptr)
-@ stdcall IcmpCreateFile()
-@ stub  IcmpParseReplies
-@ stub  IcmpSendEcho2
-@ stdcall IcmpSendEcho(ptr long ptr long ptr ptr long long)
-@ stub  do_echo_rep
-@ stub  do_echo_req
-@ stub  register_icmp
+@ stdcall IcmpCloseHandle(ptr)
+@ stdcall IcmpCreateFile()
+@ stub  IcmpParseReplies
+@ stub  IcmpSendEcho2
+@ stdcall IcmpSendEcho(ptr long ptr long ptr ptr long long)
+@ stub  do_echo_rep
+@ stub  do_echo_req
+@ stub  register_icmp
Property changes on: trunk/reactos/lib/icmp/icmp.spec
___________________________________________________________________
Name: svn:eol-style
   + native
  _____  

Modified: trunk/reactos/lib/icmp/icmp_main.c
--- trunk/reactos/lib/icmp/icmp_main.c	2005-09-05 21:06:55 UTC (rev
17667)
+++ trunk/reactos/lib/icmp/icmp_main.c	2005-09-05 21:08:24 UTC (rev
17668)
@@ -213,7 +213,7 @@

     struct timeval timeout;
     DWORD send_time,recv_time;
     struct sockaddr_in addr;
-    int addrlen;
+    unsigned int addrlen;
     unsigned short id,seq,cksum;
     int res;
 
@@ -256,7 +256,7 @@
     if (RequestOptions!=NULL) {
         int val;
         if (icp->default_opts.OptionsSize==IP_OPTS_UNKNOWN) {
-            int len;
+            unsigned int len;
             /* Before we mess with the options, get the default values
*/
             len=sizeof(val);
             getsockopt(icp->sid,IPPROTO_IP,IP_TTL,(char *)&val,&len);
@@ -455,7 +455,7 @@
                 ier->Options.OptionsData=(unsigned char *)
ier->Data-ier->Options.OptionsSize;
                 /* FIXME: We are supposed to rearrange the option's
'source route' data */
 
memmove(ier->Options.OptionsData,((char*)ip_header)+ip_header_len,ier->O
ptions.OptionsSize);
-                endbuf=ier->Options.OptionsData;
+                endbuf=(char*)ier->Options.OptionsData;
             } else {
                 ier->Options.OptionsData=NULL;
                 endbuf=ier->Data;