add config.h, remove gnuc.h. remove __dead

diff --git a/acconfig.h b/acconfig.h
new file mode 100644 (file)
index 0000000..0963da8
--- /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 c7d3aaeadefc14bdcb56b919e0bef1c3fff25542..ab225eda2ad1e177cece418476e2d797aabe28b5 100644 (file)
--- 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 c34834c7eb1ff7fd7bf28d5a02604ff3daf1b864..a13a6f521913ff93e2b4fc1225f986e6f0c6ca92 100644 (file)
--- 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 92f83914ad48be737ad1a9adec4e1eb606e389d1..6eab6ced4f0847b3d9d9e14b816df09ddddf4574 100644 (file)
--- 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 570fc3cf57a642a42df5fbe265b4ebdff7a46f45..c458911a133527ba97741604df47b0124ee7c698 100644 (file)
--- 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 fab97e55fbfd4cd289176c153a74143cb9ceb211..742081439dd3fd3e47f304e5a098a561ba20a2cf 100644 (file)
--- 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 7279409f9ad5e96cd329d37e5d2a3a7d302b590e..0df30e59d09f5d2fd52040dcbc1acbbd5a3c67b9 100644 (file)
--- 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 89b3873eada44946a75c6a8e2b477acff1cfcff4..cca3e2e97839198e04d84a297701e4c2b81de49d 100644 (file)
--- 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 ee22e06bb22b8f6283533d8535c612cb4250ae27..b78ae709aec4ca9f60ea5907e4e26121e2b8a70d 100644 (file)
--- 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 8c11b51db118114f66caf6601efb13f67af0773e..566e5869a960251e0c2913892604c46d71626ac2 100644 (file)
--- 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 bb1548dcbc7b6fc24b3fba37e30f09e4e17713af..cf7615a795b52cfe6183ef9d4199e37641b57a0e 100644 (file)
--- 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 56daa0feabbf5caa3824a5e610ea2a3a2f90f03a..243c76287d74d07853bde05e74df3976e519c905 100644 (file)
--- 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 c85955f885f88bf846a21908550db949654b91bc..e792ba69b21d1fd57bad554d4138c794edeb2261 100644 (file)
--- 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 2e3074aff5cfa6037d4a0cff99675685b92ad05c..1538b0c63a5e2d3cfe24c65723c2e3132e76555f 100644 (file)
--- 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 39ec04faa7ffb5ec4f4f6c00b5de0b3a9f21c74f..588c4d320a3c3c5a39ea1830cbe9ec63171854cb 100644 (file)
--- 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 1333a132ddf8aad2864fc8af4d30885f19c2337e..fd60aece7c198cfc35f9a3ef548145ff00c96bfb 100644 (file)
--- 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 1601a9a93ec1d6365c6ab0a0fa9771d2e01ae58b..730a53bc23ab0fabbd6574c03abc334e913e8a1c 100644 (file)
--- 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 a8623004b035d7c5ceaa2cf72339eb2d488e75cb..c0029eeedff8ba64f71210f0f839fbf9188652b1 100644 (file)
--- 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 f4ef1fa7bb255807d38b6a5dcaf0bfb51b7b0104..848a03a5a4648460c0aea5caa2ce1b17a11fd46d 100644 (file)
--- 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 50ea33c30b9fe531274806e4a5729677e147ef62..78ab7bb47915ae0353cedcbaeeab81948099bfbf 100644 (file)
--- 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 7246f69967e6e0d99f1470b499a6880d156b808a..c6d789b5a185676129806da2ebe97393dd3f8bf9 100644 (file)
--- 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