Michael Stefaniuc : include: Use ULONG instead of unsigned long in ipexport .h.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 92892873beefd075de8adf918f35da23a619313e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=92892873beefd075de8adf918f...

Author: Michael Stefaniuc 
Date:   Tue Jan  6 00:05:25 2009 +0100

include: Use ULONG instead of unsigned long in ipexport.h.

Fix also the compiler warnings introduced by this change.

---

dlls/iphlpapi/icmp.c          |    2 +-
 dlls/iphlpapi/iphlpapi_main.c |    4 ++--
 include/ipexport.h            |   10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c
index b868603..ca965fb 100644
--- a/dlls/iphlpapi/icmp.c
+++ b/dlls/iphlpapi/icmp.c
@@ -492,7 +492,7 @@ DWORD WINAPI IcmpSendEcho2(
     DWORD                    Timeout
     )
 {
-    TRACE("(%p, %p, %p, %p, %08lx, %p, %d, %p, %p, %d, %d): stub\n", IcmpHandle,
+    TRACE("(%p, %p, %p, %p, %08x, %p, %d, %p, %p, %d, %d): stub\n", IcmpHandle,
             Event, ApcRoutine, ApcContext, DestinationAddress, RequestData,
             RequestSize, RequestOptions, ReplyBuffer, ReplySize, Timeout);

diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c
index c7a4a3f..f580ca8 100644
--- a/dlls/iphlpapi/iphlpapi_main.c
+++ b/dlls/iphlpapi/iphlpapi_main.c
@@ -1550,7 +1550,7 @@ DWORD WINAPI GetPerAdapterInfo(ULONG IfIndex, PIP_PER_ADAPTER_INFO pPerAdapterIn
  */
 BOOL WINAPI GetRTTAndHopCount(IPAddr DestIpAddress, PULONG HopCount, ULONG MaxHops, PULONG RTT)
 {
-  FIXME("(DestIpAddress 0x%08lx, HopCount %p, MaxHops %d, RTT %p): stub\n",
+  FIXME("(DestIpAddress 0x%08x, HopCount %p, MaxHops %d, RTT %p): stub\n",
    DestIpAddress, HopCount, MaxHops, RTT);
   return FALSE;
 }
@@ -1880,7 +1880,7 @@ DWORD WINAPI NotifyRouteChange(PHANDLE Handle, LPOVERLAPPED overlapped)
  */
 DWORD WINAPI SendARP(IPAddr DestIP, IPAddr SrcIP, PULONG pMacAddr, PULONG PhyAddrLen)
 {
-  FIXME("(DestIP 0x%08lx, SrcIP 0x%08lx, pMacAddr %p, PhyAddrLen %p): stub\n",
+  FIXME("(DestIP 0x%08x, SrcIP 0x%08x, pMacAddr %p, PhyAddrLen %p): stub\n",
    DestIP, SrcIP, pMacAddr, PhyAddrLen);
   return ERROR_NOT_SUPPORTED;
 }
diff --git a/include/ipexport.h b/include/ipexport.h
index 9a02e00..71a44ba 100644
--- a/include/ipexport.h
+++ b/include/ipexport.h
@@ -21,9 +21,9 @@
 #ifndef __WINE_IPEXPORT_H
 #define __WINE_IPEXPORT_H

-typedef unsigned long   IPAddr;
-typedef unsigned long   IPMask;
-typedef unsigned long   IP_STATUS;
+typedef ULONG IPAddr;
+typedef ULONG IPMask;
+typedef ULONG IP_STATUS;

struct ip_option_information
 {
@@ -51,8 +51,8 @@ struct ip_option_information
 struct icmp_echo_reply
 {
     IPAddr                       Address;
-    unsigned long                Status;
-    unsigned long                RoundTripTime;
+    ULONG                        Status;
+    ULONG                        RoundTripTime;
     unsigned short               DataSize;
     unsigned short               Reserved;
     void*                        Data;