[tor-commits] [stegotorus/master] Fix pgen_pcap.cc compile failure on Linux.

[zwol at torproject.org]

commit a96d571658c89b40b1bb9829b0dcd24ce37187af
Author: Zack Weinberg <zackw at cmu.edu>
Date:   Mon Jul 16 15:36:18 2012 -0700

    Fix pgen_pcap.cc compile failure on Linux.
    
    Glibc's headers are not as promiscuous about including each other as
    OSX's are.  Also, apparently there exist at least two incompatible
    definitions of 'struct tcphdr'.  Down, not across.
---
 src/pgen_pcap.cc |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/pgen_pcap.cc b/src/pgen_pcap.cc
index cb6e475..ff17c43 100644
--- a/src/pgen_pcap.cc
+++ b/src/pgen_pcap.cc
@@ -6,12 +6,16 @@
 #include "pgen.h"
 #include "compression.h"
 
+#include <dirent.h>
+#include <signal.h>
+#include <unistd.h>
 #include <pcap/pcap.h>
+
+#define __FAVOR_BSD 1
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
-#include <dirent.h>
 
 #define NUM_FLOWS 1000
 #define NUM_LISTS 1000