summaryrefslogtreecommitdiff
path: root/tcpdump-stdinc.h
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-04-23 10:56:20 -0700
committerGuy Harris <guy@alum.mit.edu>2014-04-23 10:56:20 -0700
commit30f0d2314d1086ebf4bad29b1d11c7916338b95d (patch)
tree275dbf40966f1376596534b3e132cd6eb4a7b8f3 /tcpdump-stdinc.h
parent02fd22eb31a7385cfe483a2ee4980775a259b085 (diff)
downloadtcpdump-30f0d2314d1086ebf4bad29b1d11c7916338b95d.tar.gz
We still need u_intN_t.
Some libpcap headers use them, and even if we change libpcap to use uintN_t, we don't require that tcpdump 4.x go with libpcap 1.x - we allow people to install the latest tcpdump even if they have an older libpcap and don't want to install a newer one. However, we now define them in terms of the C99 uintN_t types, rather than trying to guess what's appropriate; using unsigned long long for u_int64_t meant that, on some platforms, u_int64_t didn't match PRI[doux]64, and using unsigned long obviously won't work on ILP32 platforms. Also, we already had calls to the autoconf macros for C99 types; get rid of the ones we added. Also also, clean up a comment in tcpdump-stdinc.h.
Diffstat (limited to 'tcpdump-stdinc.h')
-rw-r--r--tcpdump-stdinc.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/tcpdump-stdinc.h b/tcpdump-stdinc.h
index cf763cff..9a068e64 100644
--- a/tcpdump-stdinc.h
+++ b/tcpdump-stdinc.h
@@ -31,8 +31,8 @@
/*
* Include the appropriate OS header files on Windows and various flavors
- * of UNIX, and also define some additional items and include various
- * non-OS header files on Windows, and; this isolates most of the platform
+ * of UNIX, include various non-OS header files on Windows, and define
+ * various items as needed, to isolate most of tcpdump's platform
* differences to this one file.
*/