diff options
| author | mlaier <mlaier@FreeBSD.org> | 2007-10-16 02:31:48 +0000 |
|---|---|---|
| committer | mlaier <mlaier@FreeBSD.org> | 2007-10-16 02:31:48 +0000 |
| commit | 7407d685ab0d1977958bae143bdcc3b53dacea31 (patch) | |
| tree | 8c8221dcf086879544da49d1342bacd303933fa6 /contrib/tcpdump/tcpdump-stdinc.h | |
| parent | f0e5d335e38c264eb2fca7e15e417b70c8908f54 (diff) | |
| download | FreeBSD-src-7407d685ab0d1977958bae143bdcc3b53dacea31.zip FreeBSD-src-7407d685ab0d1977958bae143bdcc3b53dacea31.tar.gz | |
Resolve merge conflicts
Approved by: re (kensmith)
Obtained from: tcpdump.org
Diffstat (limited to 'contrib/tcpdump/tcpdump-stdinc.h')
| -rw-r--r-- | contrib/tcpdump/tcpdump-stdinc.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/contrib/tcpdump/tcpdump-stdinc.h b/contrib/tcpdump/tcpdump-stdinc.h index 337d45e..4e599c3 100644 --- a/contrib/tcpdump/tcpdump-stdinc.h +++ b/contrib/tcpdump/tcpdump-stdinc.h @@ -29,9 +29,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * - * @(#) $Header: /tcpdump/master/tcpdump/tcpdump-stdinc.h,v 1.12.2.4 2005/07/09 21:19:45 risso Exp $ (LBL) - * * $FreeBSD$ + * @(#) $Header: /tcpdump/master/tcpdump/tcpdump-stdinc.h,v 1.12.2.5 2006/06/23 02:07:27 hannes Exp $ (LBL) */ /* @@ -149,4 +148,12 @@ typedef char* caddr_t; #define INET_ADDRSTRLEN 16 #endif +#ifndef TRUE +#define TRUE 1 +#endif + +#ifndef FALSE +#define FALSE 0 +#endif + #endif /* tcpdump_stdinc_h */ |
