From ebb28db1b6d9ad560eaf5d6919de30db30b0a492 Mon Sep 17 00:00:00 2001
From: pdw <>
Date: Wed, 27 Aug 2003 18:29:27 +0000
Subject: [PATCH] Mac OS X fixes.

---
 AUTHORS          |  3 ++-
 ChangeLog        | 10 ++++++++++
 config/pthread.c |  2 +-
 options.c        |  4 +++-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index aeb660c..7b18dde 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -7,4 +7,5 @@ Chris Lightfoot, chris@ex-parrot.com
 
 Mangled for Solaris by
 
-Jonathan Abbey, jonabbey@ganymeta.org
\ No newline at end of file
+Jonathan Abbey, jonabbey@ganymeta.org
+
diff --git a/ChangeLog b/ChangeLog
index bc8a21d..279aeaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,16 @@
 Change log for iftop
 $Id$
 
+Attributions apply to all preceding items up to the next blank line.
+Unattributed items are by Paul Warren and Chris Lightfoot.
+
+0.14
+
+* Configure/compilation fixes for Mac OS X 
+
+* MacOS interfaces to avoid by default
+    Siri Dhyan Singh <sirid@positivemind.com>
+
 0.13 11/06/03
 
 * Fixed configure.in to properly specify libraries without the leading -l
diff --git a/config/pthread.c b/config/pthread.c
index 071e5ae..ae39e4d 100644
--- a/config/pthread.c
+++ b/config/pthread.c
@@ -24,7 +24,7 @@ void *worker_thread(void *v) {
     pthread_cond_signal(&cond);
     pthread_mutex_unlock(&mtx);
     while (1)
-        pause();
+        pthread_testcancel();
 }
 
 /* Start a thread, and have it set a variable to some other value, then signal
diff --git a/options.c b/options.c
index a3f6030..12bff2e 100644
--- a/options.c
+++ b/options.c
@@ -40,6 +40,8 @@ char optstr[] = "+i:f:nN:hpbBP";
 static char *bad_interface_names[] = {
             "lo:",
 	    "lo",
+	    "stf",     /* pseudo-device 6to4 tunnel interface */
+	    "gif",     /* psuedo-device generic tunnel interface */
             "dummy",
             "vmnet",
             NULL        /* last entry must be NULL */
@@ -144,7 +146,7 @@ static void set_net_filter(char* arg) {
               options.netfiltermask.s_addr = htonl(0xffffffffl);
             }
             else {
-              uint32_t mm = 0xffffffffl;
+              u_int32_t mm = 0xffffffffl;
               mm >>= n;
               options.netfiltermask.s_addr = htonl(~mm);
             }