Sync to Wine-20050830:

Mike McCormack <mike@codeweavers.com>
- gcc 4.0 warning fixes.

svn path=/trunk/; revision=17668
This commit is contained in:
Gé van Geldorp 2005-09-05 21:08:24 +00:00
parent a3b56ff138
commit ee77339f00
2 changed files with 11 additions and 11 deletions

View file

@ -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

View file

@ -213,7 +213,7 @@ DWORD WINAPI IcmpSendEcho(
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 @@ DWORD WINAPI IcmpSendEcho(
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 @@ DWORD WINAPI IcmpSendEcho(
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->Options.OptionsSize);
endbuf=ier->Options.OptionsData;
endbuf=(char*)ier->Options.OptionsData;
} else {
ier->Options.OptionsData=NULL;
endbuf=ier->Data;