From: Roger Wolff <r.e.wolff@bitwizard.nl>
Date: Mon, 16 Aug 2004 00:00:00 +0000 (+0000)
Subject: mtr v0.64
X-Git-Tag: v0.64^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3210151c58dd98731816b57b0e375250aeb8fb6f;p=thirdparty%2Fmtr.git

mtr v0.64

 - Philippe suggests to do the time_t thingy before socket.h.
   Apparently, MAC OS X doesn't compile socket.h otherwise.

source: ftp://ftp.bitwizard.nl/mtr/mtr-0.64.tar.gz
---

diff --git a/NEWS b/NEWS
index 60ee8a1..2f87116 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,7 @@
 WHAT'S NEW?
+  v0.64 Philippe suggests to do the time_t thingy before socket.h. 
+        Apparently, MAC OS X doesn't compile socket.h otherwise.
+
   v0.63 Suggestion by RCW: Add -lm at line 70 of Configure.in.
         On my system no ill effects ensued, so this version released 
         so that he can test if it still works on his sytem. 
diff --git a/configure.in b/configure.in
index 20570c5..c934b0a 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(mtr.c)
-AM_INIT_AUTOMAKE(mtr, 0.63)
+AM_INIT_AUTOMAKE(mtr, 0.64)
 
 
 AC_SUBST(GTK_OBJ)
diff --git a/curses.c b/curses.c
index dff24fd..943670d 100644
--- a/curses.c
+++ b/curses.c
@@ -23,6 +23,15 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
+
+/* Philippe tells me MacOSX needs this before scoket.h... -- REW */
+#if defined(HAVE_SYS_TYPES_H)
+#include <sys/types.h>
+#else
+/* If a system doesn't have sys/types.h, lets hope that time_t is an int */
+#define time_t int
+#endif
+
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -39,13 +48,6 @@
 #  error No curses header file available
 #endif
 
-#if defined(HAVE_SYS_TYPES_H)
-#include <sys/types.h>
-#else
-/* If a system doesn't have sys/types.h, lets hope that time_t is an int */
-#define time_t int
-#endif
-
 #ifndef HAVE_ATTRON
 #define attron(x) 
 #define attroff(x)