George Neill's fix acountry sample application compilation failure.

diff --git a/ares/CHANGES b/ares/CHANGES
index 16e55bebebae16fb45e32326f725f26382d6ca13..a7b08d13848cb5562e96e4b33e8331032873a70b 100644 (file)
--- a/ares/CHANGES
+++ b/ares/CHANGES
@@ -12,6 +12,9 @@
   connected to. Only necessary on UDP sockets as they are connection-less, TCP
   is unaffected.
 
+- Fix by George Neill:
+  Fixed compilation of acountry sample application failure on some systems.
+
 * Aug 4 2008 (Daniel Stenberg)
 - Fix by Tofu Linden:
 

diff --git a/ares/RELEASE-NOTES b/ares/RELEASE-NOTES
index 388816052b4cff57ec636ed7baf8a40ffc463e35..8f1de7cfeb07c60b4856953e17c3da967583f4ac 100644 (file)
--- a/ares/RELEASE-NOTES
+++ b/ares/RELEASE-NOTES
@@ -10,10 +10,11 @@ This is what's new and changed in the c-ares 1.5.3 release:
  o Improved configure detection of number of arguments for getservbyport_r
  o Improved query-ID randomness
  o Validate that DNS response address matches the request address
+ o fix acountry sample application compilation failure on some systems
 
 Thanks go to these friendly people for their efforts and contributions:
 
- Brad House, Yang Tse, Phil Blundell, Tofu Linden
+ Brad House, Yang Tse, Phil Blundell, Tofu Linden, George Neill
  and obviously Daniel Stenberg
 
 Have fun!

diff --git a/ares/acountry.c b/ares/acountry.c
index 5d041ed385ec543ef6cba0baa81ad7c92a19a7d0..afee113b9c0fb97ddc05ad7d3b63745231feab93 100644 (file)
--- a/ares/acountry.c
+++ b/ares/acountry.c
@@ -60,6 +60,10 @@
 #include "inet_net_pton.h"
 #include "inet_ntop.h"
 
+#ifndef INADDR_NONE
+#define INADDR_NONE 0xffffffff
+#endif
+
 static const char *usage      = "acountry [-vh?] {host|addr} ...\n";
 static const char  nerd_fmt[] = "%u.%u.%u.%u.zz.countries.nerd.dk";
 static const char *nerd_ver1  = nerd_fmt + 14;