aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--acconfig.h10
-rw-r--r--bpf_image.c7
-rw-r--r--etherent.c7
-rw-r--r--gencode.c10
-rw-r--r--gencode.h9
-rw-r--r--grammar.y7
-rw-r--r--inet.c7
-rw-r--r--nametoaddr.c7
-rw-r--r--optimize.c7
-rw-r--r--pcap-bpf.c7
-rw-r--r--pcap-dlpi.c7
-rw-r--r--pcap-enet.c6
-rw-r--r--pcap-linux.c4
-rw-r--r--pcap-nit.c7
-rw-r--r--pcap-null.c7
-rw-r--r--pcap-pf.c7
-rw-r--r--pcap-snit.c7
-rw-r--r--pcap-snoop.c7
-rw-r--r--pcap.c7
-rw-r--r--savefile.c7
-rw-r--r--scanner.l7
21 files changed, 109 insertions, 42 deletions
diff --git a/acconfig.h b/acconfig.h
new file mode 100644
index 00000000..0963da83
--- /dev/null
+++ b/acconfig.h
@@ -0,0 +1,10 @@
+@TOP@
+
+/* Define __P() macro, if necessary */
+#ifndef __P
+#if __STDC__
+#define __P(protos) protos
+#else
+#define __P(protos) ()
+#endif
+#endif
diff --git a/bpf_image.c b/bpf_image.c
index c7d3aaea..ab225eda 100644
--- a/bpf_image.c
+++ b/bpf_image.c
@@ -21,7 +21,11 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/libpcap/bpf_image.c,v 1.23 2000-04-27 09:11:11 itojun Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/bpf_image.c,v 1.24 2000-07-11 00:37:04 assar Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
#endif
#include <sys/types.h>
@@ -32,7 +36,6 @@ static const char rcsid[] =
#include "pcap-int.h"
-#include "gnuc.h"
#ifdef HAVE_OS_PROTO_H
#include "os-proto.h"
#endif
diff --git a/etherent.c b/etherent.c
index c34834c7..a13a6f52 100644
--- a/etherent.c
+++ b/etherent.c
@@ -21,7 +21,11 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/libpcap/etherent.c,v 1.20 1999-10-07 23:46:40 mcr Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/etherent.c,v 1.21 2000-07-11 00:37:04 assar Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
#endif
#include <sys/types.h>
@@ -35,7 +39,6 @@ static const char rcsid[] =
#include <pcap-namedb.h>
-#include "gnuc.h"
#ifdef HAVE_OS_PROTO_H
#include "os-proto.h"
#endif
diff --git a/gencode.c b/gencode.c
index 92f83914..6eab6ced 100644
--- a/gencode.c
+++ b/gencode.c
@@ -21,7 +21,11 @@
*/
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.112 2000-07-01 03:32:50 assar Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.113 2000-07-11 00:37:04 assar Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
#endif
#include <sys/types.h>
@@ -54,7 +58,6 @@ struct rtentry;
#include <sys/socket.h>
#endif /*INET6*/
-#include "gnuc.h"
#ifdef HAVE_OS_PROTO_H
#include "os-proto.h"
#endif
@@ -73,8 +76,9 @@ int pcap_fddipad;
#endif
/* VARARGS */
-__dead void
+void
bpf_error(const char *fmt, ...)
+
{
va_list ap;
diff --git a/gencode.h b/gencode.h
index 570fc3cf..c458911a 100644
--- a/gencode.h
+++ b/gencode.h
@@ -18,12 +18,9 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * @(#) $Header: /tcpdump/master/libpcap/gencode.h,v 1.39 2000-07-01 03:33:48 assar Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/gencode.h,v 1.40 2000-07-11 00:37:07 assar Exp $ (LBL)
*/
-/*XXX*/
-#include "gnuc.h"
-
/* Address qualifiers. */
#define Q_HOST 1
@@ -177,9 +174,9 @@ struct block *gen_multicast(int);
struct block *gen_inbound(int);
void bpf_optimize(struct block **);
-__dead void bpf_error(const char *, ...)
+void bpf_error(const char *, ...)
#if HAVE___ATTRIBUTE__
- __attribute__((volatile, format (printf, 1, 2)))
+ __attribute__((noreturn, format (printf, 1, 2)))
#endif
;
diff --git a/grammar.y b/grammar.y
index fab97e55..74208143 100644
--- a/grammar.y
+++ b/grammar.y
@@ -22,7 +22,11 @@
*/
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/libpcap/grammar.y,v 1.58 2000-06-03 16:29:43 itojun Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/grammar.y,v 1.59 2000-07-11 00:37:08 assar Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
#endif
#include <sys/types.h>
@@ -47,7 +51,6 @@ struct rtentry;
#include "gencode.h"
#include <pcap-namedb.h>
-#include "gnuc.h"
#ifdef HAVE_OS_PROTO_H
#include "os-proto.h"
#endif
diff --git a/inet.c b/inet.c
index 7279409f..0df30e59 100644
--- a/inet.c
+++ b/inet.c
@@ -33,7 +33,11 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/libpcap/inet.c,v 1.33 2000-07-01 03:34:10 assar Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/inet.c,v 1.34 2000-07-11 00:37:04 assar Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
#endif
#include <sys/param.h>
@@ -63,7 +67,6 @@ struct rtentry;
#include "pcap-int.h"
-#include "gnuc.h"
#ifdef HAVE_OS_PROTO_H
#include "os-proto.h"
#endif
diff --git a/nametoaddr.c b/nametoaddr.c
index 89b3873e..cca3e2e9 100644
--- a/nametoaddr.c
+++ b/nametoaddr.c
@@ -24,7 +24,11 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/libpcap/nametoaddr.c,v 1.53 2000-07-01 03:35:08 assar Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/nametoaddr.c,v 1.54 2000-07-11 00:37:05 assar Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
#endif
#include <sys/param.h>
@@ -55,7 +59,6 @@ struct rtentry;
#include "gencode.h"
#include <pcap-namedb.h>
-#include "gnuc.h"
#ifdef HAVE_OS_PROTO_H
#include "os-proto.h"
#endif
diff --git a/optimize.c b/optimize.c
index ee22e06b..b78ae709 100644
--- a/optimize.c
+++ b/optimize.c
@@ -22,7 +22,11 @@
*/
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/libpcap/optimize.c,v 1.62 2000-04-27 09:11:12 itojun Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/optimize.c,v 1.63 2000-07-11 00:37:05 assar Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
#endif
#include <sys/types.h>
@@ -36,7 +40,6 @@ static const char rcsid[] =
#include "gencode.h"
-#include "gnuc.h"
#ifdef HAVE_OS_PROTO_H
#include "os-proto.h"
#endif
diff --git a/pcap-bpf.c b/pcap-bpf.c
index 8c11b51d..566e5869 100644
--- a/pcap-bpf.c
+++ b/pcap-bpf.c
@@ -20,7 +20,11 @@
*/
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/libpcap/pcap-bpf.c,v 1.34 2000-07-10 04:50:05 assar Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/pcap-bpf.c,v 1.35 2000-07-11 00:37:05 assar Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
#endif
#include <sys/param.h> /* optionally get BSD define */
@@ -42,7 +46,6 @@ static const char rcsid[] =
#include "pcap-int.h"
-#include "gnuc.h"
#ifdef HAVE_OS_PROTO_H
#include "os-proto.h"
#endif
diff --git a/pcap-dlpi.c b/pcap-dlpi.c
index bb1548dc..cf7615a7 100644
--- a/pcap-dlpi.c
+++ b/pcap-dlpi.c
@@ -38,7 +38,11 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/libpcap/pcap-dlpi.c,v 1.57 2000-07-06 01:50:36 assar Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/pcap-dlpi.c,v 1.58 2000-07-11 00:37:05 assar Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
#endif
#include <sys/types.h>
@@ -80,7 +84,6 @@ static const char rcsid[] =
#include "pcap-int.h"
-#include "gnuc.h"
#ifdef HAVE_OS_PROTO_H
#include "os-proto.h"
#endif
diff --git a/pcap-enet.c b/pcap-enet.c
index 56daa0fe..243c7628 100644
--- a/pcap-enet.c
+++ b/pcap-enet.c
@@ -8,7 +8,11 @@
*/
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/libpcap/pcap-enet.c,v 1.2 2000-01-10 18:42:59 fenner Exp $";
+ "@(#) $Header: /tcpdump/master/libpcap/pcap-enet.c,v 1.3 2000-07-11 00:37:06 assar Exp $";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
#endif
#include <sys/types.h>
diff --git a/pcap-linux.c b/pcap-linux.c
index c85955f8..e792ba69 100644
--- a/pcap-linux.c
+++ b/pcap-linux.c
@@ -47,6 +47,10 @@
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "pcap-int.h"
#include <errno.h>
diff --git a/pcap-nit.c b/pcap-nit.c
index 2e3074af..1538b0c6 100644
--- a/pcap-nit.c
+++ b/pcap-nit.c
@@ -20,7 +20,11 @@
*/
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/libpcap/pcap-nit.c,v 1.34 2000-04-27 14:24:12 itojun Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/pcap-nit.c,v 1.35 2000-07-11 00:37:06 assar Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
#endif
#include <sys/types.h>
@@ -49,7 +53,6 @@ static const char rcsid[] =
#include "pcap-int.h"
-#include "gnuc.h"
#ifdef HAVE_OS_PROTO_H
#include "os-proto.h"
#endif
diff --git a/pcap-null.c b/pcap-null.c
index 39ec04fa..588c4d32 100644
--- a/pcap-null.c
+++ b/pcap-null.c
@@ -20,14 +20,17 @@
*/
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/libpcap/pcap-null.c,v 1.11 2000-06-26 05:12:11 assar Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/pcap-null.c,v 1.12 2000-07-11 00:37:06 assar Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
#endif
#include <sys/param.h> /* optionally get BSD define */
#include <string.h>
-#include "gnuc.h"
#ifdef HAVE_OS_PROTO_H
#include "os-proto.h"
#endif
diff --git a/pcap-pf.c b/pcap-pf.c
index 1333a132..fd60aece 100644
--- a/pcap-pf.c
+++ b/pcap-pf.c
@@ -24,7 +24,11 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/libpcap/pcap-pf.c,v 1.57 2000-07-01 03:35:08 assar Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/pcap-pf.c,v 1.58 2000-07-11 00:37:06 assar Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
#endif
#include <sys/types.h>
@@ -59,7 +63,6 @@ struct rtentry;
#include "pcap-int.h"
-#include "gnuc.h"
#ifdef HAVE_OS_PROTO_H
#include "os-proto.h"
#endif
diff --git a/pcap-snit.c b/pcap-snit.c
index 1601a9a9..730a53bc 100644
--- a/pcap-snit.c
+++ b/pcap-snit.c
@@ -25,7 +25,11 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/libpcap/pcap-snit.c,v 1.49 2000-07-01 03:35:07 assar Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/pcap-snit.c,v 1.50 2000-07-11 00:37:07 assar Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
#endif
#include <sys/types.h>
@@ -62,7 +66,6 @@ static const char rcsid[] =
#include "pcap-int.h"
-#include "gnuc.h"
#ifdef HAVE_OS_PROTO_H
#include "os-proto.h"
#endif
diff --git a/pcap-snoop.c b/pcap-snoop.c
index a8623004..c0029eee 100644
--- a/pcap-snoop.c
+++ b/pcap-snoop.c
@@ -20,7 +20,11 @@
*/
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/libpcap/pcap-snoop.c,v 1.25 2000-04-30 07:32:56 assar Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/pcap-snoop.c,v 1.26 2000-07-11 00:37:07 assar Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
#endif
#include <sys/param.h>
@@ -50,7 +54,6 @@ static const char rcsid[] =
#include "pcap-int.h"
-#include "gnuc.h"
#ifdef HAVE_OS_PROTO_H
#include "os-proto.h"
#endif
diff --git a/pcap.c b/pcap.c
index f4ef1fa7..848a03a5 100644
--- a/pcap.c
+++ b/pcap.c
@@ -33,7 +33,11 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/libpcap/pcap.c,v 1.31 2000-06-26 04:58:04 assar Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/pcap.c,v 1.32 2000-07-11 00:37:07 assar Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
#endif
#include <sys/types.h>
@@ -43,7 +47,6 @@ static const char rcsid[] =
#include <string.h>
#include <unistd.h>
-#include "gnuc.h"
#ifdef HAVE_OS_PROTO_H
#include "os-proto.h"
#endif
diff --git a/savefile.c b/savefile.c
index 50ea33c3..78ab7bb4 100644
--- a/savefile.c
+++ b/savefile.c
@@ -30,7 +30,11 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.39 2000-04-27 09:11:14 itojun Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.40 2000-07-11 00:37:07 assar Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
#endif
#include <sys/types.h>
@@ -44,7 +48,6 @@ static const char rcsid[] =
#include "pcap-int.h"
-#include "gnuc.h"
#ifdef HAVE_OS_PROTO_H
#include "os-proto.h"
#endif
diff --git a/scanner.l b/scanner.l
index 7246f699..c6d789b5 100644
--- a/scanner.l
+++ b/scanner.l
@@ -22,7 +22,11 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/libpcap/scanner.l,v 1.63 2000-06-10 14:42:27 assar Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/scanner.l,v 1.64 2000-07-11 00:37:08 assar Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
#endif
#include <sys/types.h>
@@ -46,7 +50,6 @@ static const char rcsid[] =
#endif /*INET6*/
#include "tokdefs.h"
-#include "gnuc.h"
#ifdef HAVE_OS_PROTO_H
#include "os-proto.h"
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-10 09:18:22 +0000