From 6e2229e0a5080d86c219ffd2d0cb572ddf24bf5f Mon Sep 17 00:00:00 2001
From: kris <kris@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Thu, 12 Apr 2007 21:21:58 +0000
Subject: [PATCH] A little portability patch.  Wrapping ICMP_* #define's in
 traceroute.h with #ifndef's to test for availability instead of using
 defined(WIN32), defined(MACOSX), etc.  Eddie thinks it's inelegant -- and I
 pretty much agree -- but it seems better than keeping up with different
 systems the other way.

---
 traceroute.h | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/traceroute.h b/traceroute.h
index add999b47..59d4b8849 100644
--- a/traceroute.h
+++ b/traceroute.h
@@ -124,20 +124,46 @@
 
 #define NAMEIPLEN MAXHOSTNAMELEN+INET6_ADDRSTRLEN
 
-#if defined(WIN32) || defined(MACOSX)
+#ifndef ICMP_ECHOREPLY
  #define ICMP_ECHOREPLY 0
+#endif
+#ifndef ICMP_DEST_UNREACH
  #define ICMP_DEST_UNREACH 3
+#endif
+#ifndef ICMP_ECHO
  #define ICMP_ECHO 8
+#endif
+#ifndef ICMP_TIME_EXCEEDED
  #define ICMP_TIME_EXCEEDED 11
+#endif
+#ifndef ICMP_TIMESTAMP
  #define ICMP_TIMESTAMP 13
+#endif
+#ifndef ICMP_TIMESTAMPREPLY
  #define ICMP_TIMESTAMPREPLY 14
+#endif
+#ifndef ICMP_ADDRESS
  #define ICMP_ADDRESS 17
+#endif
+#ifndef ICMP_ADDRESSREPLY
  #define ICMP_ADDRESSREPLY 18
+#endif
+#ifndef ICMP_HOST_UNREACH
  #define ICMP_HOST_UNREACH 1
+#endif
+#ifndef ICMP_PROT_UNREACH
  #define ICMP_PROT_UNREACH 2
+#endif
+#ifndef ICMP_PORT_UNREACH
  #define ICMP_PORT_UNREACH 3
+#endif
+#ifndef ICMP_NET_ANO
  #define ICMP_NET_ANO 9
+#endif
+#ifndef ICMP_HOST_ANO
  #define ICMP_HOST_ANO 10
+#endif
+#ifndef ICMP_PKT_FILTERED
  #define ICMP_PKT_FILTERED 13
 #endif