s/u_long/unsigned long/

diff --git a/ares/CHANGES b/ares/CHANGES
index 3a4a99ccfafbcb5b56f8c483a351140a53a6657e..90ee71113751db078207324fb978f2b549b24134 100644 (file)
--- a/ares/CHANGES
+++ b/ares/CHANGES
@@ -1,5 +1,8 @@
   Changelog for the c-ares project
 
+* March 11 2009 (Yang Tse)
+- Japheth Cleaver fixed acountry.c replacing u_long with unsigned long.
+
 * February 20 2009 (Yang Tse)
 - Do not halt compilation when using VS2008 to build a Windows 2000 target.
 

diff --git a/ares/RELEASE-NOTES b/ares/RELEASE-NOTES
index 761121be575c04fa6e3bd18ccf622ceb1bf6a3e9..93760e5b49b0628105ff2403529ab6bcaa96b6a5 100644 (file)
--- a/ares/RELEASE-NOTES
+++ b/ares/RELEASE-NOTES
@@ -14,6 +14,6 @@ Fixed:
 
 Thanks go to these friendly people for their efforts and contributions:
 
- Phil Blundell
+ Phil Blundell, Japheth Cleaver
 
 Have fun!

diff --git a/ares/acountry.c b/ares/acountry.c
index 9b3533410e4f4f5b0d41e78eff0f80b9f0204a8c..cac9ae5b0988e9e0846024778c7dacdd7794dc86 100644 (file)
--- a/ares/acountry.c
+++ b/ares/acountry.c
@@ -547,7 +547,7 @@ static void find_country_from_cname(const char *cname, struct in_addr addr)
   const struct search_list *country;
   char  ccode_A2[3], *ccopy, *dot_4;
   int   cnumber, z0, z1, ver_1, ver_2;
-  u_long ip;
+  unsigned long ip;
 
   ip = ntohl(addr.s_addr);
   z0 = tolower(cname[0]);