Upstream has retired the gnuc.h header, so do so as well, killing a gcc 2.x

reference.

ok sthen@ jca@ deraadt@

6 files changed, 6 insertions, 47 deletions

diff --git a/usr.sbin/tcpdump/INSTALL b/usr.sbin/tcpdump/INSTALL
index a92b1fc5094..7565dcff170 100644
--- a/usr.sbin/tcpdump/INSTALL
+++ b/usr.sbin/tcpdump/INSTALL
@@ -1,4 +1,4 @@
-@(#) $Id: INSTALL,v 1.4 2007/10/07 16:41:05 deraadt Exp $ (LBL)
+@(#) $Id: INSTALL,v 1.5 2015/04/05 17:02:57 guenther Exp $ (LBL)
 
 If you have not built libpcap, do so first.  See the README
 file in this directory for the ftp location.
@@ -71,7 +71,6 @@ extract.h	- alignment definitions
 fddi.h		- Fiber Distributed Data Interface definitions
 gmt2local.c	- time conversion routines
 gmt2local.h	- time conversion prototypes
-gnuc.h		- XXX
 igrp.h		- Interior Gateway Routing Protocol definitions
 interface.h	- globals, prototypes and definitions
 ipx.h		- IPX definitions
diff --git a/usr.sbin/tcpdump/gmt2local.c b/usr.sbin/tcpdump/gmt2local.c
index a752caea333..0e4bff30de1 100644
--- a/usr.sbin/tcpdump/gmt2local.c
+++ b/usr.sbin/tcpdump/gmt2local.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gmt2local.c,v 1.5 2009/10/27 23:59:55 deraadt Exp $	*/
+/*	$OpenBSD: gmt2local.c,v 1.6 2015/04/05 17:02:57 guenther Exp $	*/
 
 /*
  * Copyright (c) 1997
@@ -29,7 +29,6 @@
 #include <time.h>
 #endif
 
-#include "gnuc.h"
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif
diff --git a/usr.sbin/tcpdump/gnuc.h b/usr.sbin/tcpdump/gnuc.h
deleted file mode 100644
index 40f6f638f36..00000000000
--- a/usr.sbin/tcpdump/gnuc.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$OpenBSD: gnuc.h,v 1.5 2007/10/07 16:41:05 deraadt Exp $	*/
-
-/* @(#) $Id: gnuc.h,v 1.5 2007/10/07 16:41:05 deraadt Exp $ (LBL) */
-
-/* inline foo */
-#ifdef __GNUC__
-#define inline __inline
-#else
-#define inline
-#endif
-
-/*
- * Handle new and old "dead" routine prototypes
- *
- * For example:
- *
- *	__dead void foo(void) __attribute__((volatile));
- *
- */
-#ifdef __GNUC__
-#ifndef __dead
-#define __dead volatile
-#endif
-#if __GNUC__ < 2  || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
-#ifndef __attribute__
-#define __attribute__(args)
-#endif
-#endif
-#else
-#ifndef __dead
-#define __dead
-#endif
-#ifndef __attribute__
-#define __attribute__(args)
-#endif
-#endif
diff --git a/usr.sbin/tcpdump/interface.h b/usr.sbin/tcpdump/interface.h
index dfe64709079..25f35a0e853 100644
--- a/usr.sbin/tcpdump/interface.h
+++ b/usr.sbin/tcpdump/interface.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: interface.h,v 1.64 2014/11/20 03:56:33 jsg Exp $	*/
+/*	$OpenBSD: interface.h,v 1.65 2015/04/05 17:02:57 guenther Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -20,13 +20,12 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @(#) $Id: interface.h,v 1.64 2014/11/20 03:56:33 jsg Exp $ (LBL)
+ * @(#) $Id: interface.h,v 1.65 2015/04/05 17:02:57 guenther Exp $ (LBL)
  */
 
 #ifndef tcpdump_interface_h
 #define tcpdump_interface_h
 
-#include "gnuc.h"
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif
diff --git a/usr.sbin/tcpdump/savestr.c b/usr.sbin/tcpdump/savestr.c
index f3cb5955f3e..b0fc6df6fc0 100644
--- a/usr.sbin/tcpdump/savestr.c
+++ b/usr.sbin/tcpdump/savestr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: savestr.c,v 1.7 2009/10/27 23:59:57 deraadt Exp $	*/
+/*	$OpenBSD: savestr.c,v 1.8 2015/04/05 17:02:57 guenther Exp $	*/
 
 /*
  * Copyright (c) 1997
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "gnuc.h"
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif
diff --git a/usr.sbin/tcpdump/setsignal.c b/usr.sbin/tcpdump/setsignal.c
index 2421ca87a54..cf761a1e9d6 100644
--- a/usr.sbin/tcpdump/setsignal.c
+++ b/usr.sbin/tcpdump/setsignal.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: setsignal.c,v 1.4 2009/10/27 23:59:57 deraadt Exp $	*/
+/*	$OpenBSD: setsignal.c,v 1.5 2015/04/05 17:02:57 guenther Exp $	*/
 
 /*
  * Copyright (c) 1997
@@ -31,7 +31,6 @@
 #include <string.h>
 #endif
 
-#include "gnuc.h"
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif