diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-07-20 04:49:57 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-07-20 04:49:57 +0000 |
| commit | 71485f8b41b88ac37f4b80682b25979427a1bfd7 (patch) | |
| tree | 06f48d6e0fc6dad8042285ca695cda2714e85857 /lib/libpcap/etherent.c | |
| parent | 8f264cbfafae23f6fdc50edac746009289631659 (diff) | |
changes brought in from v0.4; started by brad, more by me, being tested by mts
Diffstat (limited to 'lib/libpcap/etherent.c')
| -rw-r--r-- | lib/libpcap/etherent.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/libpcap/etherent.c b/lib/libpcap/etherent.c index 4e2f4fb8f56..48e3db16cee 100644 --- a/lib/libpcap/etherent.c +++ b/lib/libpcap/etherent.c @@ -1,7 +1,7 @@ -/* $OpenBSD: etherent.c,v 1.5 1996/09/16 02:33:04 tholo Exp $ */ +/* $OpenBSD: etherent.c,v 1.6 1999/07/20 04:49:54 deraadt Exp $ */ /* - * Copyright (c) 1990, 1993, 1994, 1995 + * Copyright (c) 1990, 1993, 1994, 1995, 1996 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -20,26 +20,26 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ + #ifndef lint -static char rcsid[] = - "@(#) Header: etherent.c,v 1.18 95/10/07 03:08:12 leres Exp (LBL)"; +static const char rcsid[] = + "@(#) $Header: /cvs/OpenBSD/src/lib/libpcap/etherent.c,v 1.6 1999/07/20 04:49:54 deraadt Exp $ (LBL)"; #endif #include <sys/types.h> #include <ctype.h> #include <memory.h> -#include <pcap.h> -#include <pcap-namedb.h> #include <stdio.h> #include <string.h> +#include "pcap-int.h" + +#include <pcap-namedb.h> #ifdef HAVE_OS_PROTO_H #include "os-proto.h" #endif -#include "pcap-int.h" - static __inline int xdtoi(int); static __inline int skip_space(FILE *); static __inline int skip_line(FILE *); |