remove gnuc.h and __dead

diff --git a/gmt2local.c b/gmt2local.c
index 5626465346e7b7fe91692c3907c9e564dcb4bf03..752749673e7c5570a5becc618f79900db95ca7a4 100644 (file)
--- a/gmt2local.c
+++ b/gmt2local.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/gmt2local.c,v 1.3 1999-11-21 09:36:47 fenner Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/gmt2local.c,v 1.4 2000-07-11 00:49:02 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -36,7 +36,6 @@ static const char rcsid[] =
 #include <time.h>
 #endif
 
-#include "gnuc.h"
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif

diff --git a/interface.h b/interface.h
index cd661c50b4c30125185e2b5fac0ac646f3f045d4..10c96fd646f82418a1ade1bcdff615dbaa107967 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -18,13 +18,12 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.131 2000-07-01 03:39:00 assar Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.132 2000-07-11 00:49:02 assar Exp $ (LBL)
  */
 
 #ifndef tcpdump_interface_h
 #define tcpdump_interface_h
 
-#include "gnuc.h"
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif
@@ -198,8 +197,8 @@ extern char *dnaddr_string(u_short);
 
 extern void wrapup(int);
 
-extern __dead void error(const char *, ...)
-    __attribute__((volatile, format (printf, 1, 2)));
+extern void error(const char *, ...)
+    __attribute__((noreturn, format (printf, 1, 2)));
 extern void warning(const char *, ...) __attribute__ ((format (printf, 1, 2)));
 
 extern char *read_infile(char *);

diff --git a/savestr.c b/savestr.c
index e99e3c94112f092d47305ebb1b2ff5122598cfe4..7ff87ad9a65c7a59c003e8290c272dfca7173549 100644 (file)
--- a/savestr.c
+++ b/savestr.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/Attic/savestr.c,v 1.5 2000-07-01 03:39:11 assar Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/Attic/savestr.c,v 1.6 2000-07-11 00:49:02 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -34,7 +34,6 @@ static const char rcsid[] =
 #include <stdlib.h>
 #include <string.h>
 
-#include "gnuc.h"
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif

diff --git a/setsignal.c b/setsignal.c
index add29792ce7c93118b724c7b43c8ffb243f3fef8..5269a7f1b5615fd0632943946a9c8aa8f8368734 100644 (file)
--- a/setsignal.c
+++ b/setsignal.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/setsignal.c,v 1.6 2000-07-01 03:39:12 assar Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/setsignal.c,v 1.7 2000-07-11 00:49:03 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -35,7 +35,6 @@ static const char rcsid[] =
 #include <string.h>
 #endif
 
-#include "gnuc.h"
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif

diff --git a/tcpdump.c b/tcpdump.c
index 78fbaffadd233b50fe031d11fcba4fed4cf90c7d..9e1b758af9c09281fb101dc91a1cbe58e892f97c 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -24,7 +24,7 @@ static const char copyright[] =
     "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997\n\
 The Regents of the University of California.  All rights reserved.\n";
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.148 2000-06-18 11:12:06 assar Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.149 2000-07-11 00:49:17 assar Exp $ (LBL)";
 #endif
 
 /*
@@ -90,7 +90,7 @@ int32_t thiszone;             /* seconds offset from gmt to local time */
 
 /* Forwards */
 static RETSIGTYPE cleanup(int);
-extern __dead void usage(void) __attribute__((volatile));
+static void usage(void) __attribute__((noreturn));
 
 /* Length of saved portion of packet. */
 int snaplen = DEFAULT_SNAPLEN;
@@ -483,7 +483,7 @@ default_print(register const u_char *bp, register u_int length)
        default_print_unaligned(bp, length);
 }
 
-__dead void
+static void
 usage(void)
 {
        extern char version[];

diff --git a/util.c b/util.c
index c205615a4056de6f695133bd3f74c6deb3e58715..558f2fbfb27baeb883fb33cb87487e78b640bcbf 100644 (file)
--- a/util.c
+++ b/util.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/util.c,v 1.68 2000-07-01 03:39:12 assar Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/util.c,v 1.69 2000-07-11 00:49:03 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -219,7 +219,7 @@ tok2str(register const struct tok *lp, register const char *fmt,
 
 
 /* VARARGS */
-__dead void
+void
 error(const char *fmt, ...)
 {
        va_list ap;