From Neil Spring:

	use "_U_" in the definitions of "rcsid[]", to eliminate
	complaints about those variables being unused;

	move the definitions after the include of "interface.h", or add
	an include of "interface.h", so that "_U_" is defined.

Include "config.h" before including "tcpdump-stdinc.h" in
"missing/datalinks.c".

10 files changed, 77 insertions, 37 deletions

diff --git a/missing/datalinks.c b/missing/datalinks.c
index 64996971..36eb1c46 100644
--- a/missing/datalinks.c
+++ b/missing/datalinks.c
@@ -31,13 +31,19 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/missing/datalinks.c,v 1.1 2002-12-19 09:27:58 guy Exp $ (LBL)";
+#ifdef HAVE_CONFIG_H
+#include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
+#include "interface.h"
+
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/missing/datalinks.c,v 1.2 2003-11-15 00:39:46 guy Exp $ (LBL)";
+#endif
+
 #include <pcap.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/missing/dlnames.c b/missing/dlnames.c
index 7db76a2a..9dececf6 100644
--- a/missing/dlnames.c
+++ b/missing/dlnames.c
@@ -31,10 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/missing/dlnames.c,v 1.2 2003-05-02 08:46:29 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -42,6 +38,14 @@ static const char rcsid[] =
 
 #include <tcpdump-stdinc.h>
 
+
+#include "interface.h"
+
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/missing/dlnames.c,v 1.3 2003-11-15 00:39:47 guy Exp $ (LBL)";
+#endif
+
 #include <pcap.h>
 #include <string.h>
 
diff --git a/missing/getaddrinfo.c b/missing/getaddrinfo.c
index 458fe014..e37f9363 100644
--- a/missing/getaddrinfo.c
+++ b/missing/getaddrinfo.c
@@ -49,9 +49,14 @@
 #include <config.h>
 #endif
 
+#include "tcpdump-stdinc.h"
+
+#include "interface.h"
+
+
 #ifndef lint
 static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/missing/getaddrinfo.c,v 1.11 2002-06-11 17:13:37 itojun Exp $";
+     "@(#) $Header: /tcpdump/master/tcpdump/missing/getaddrinfo.c,v 1.12 2003-11-15 00:39:47 guy Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/missing/getnameinfo.c b/missing/getnameinfo.c
index 9ea76b48..f37e6b13 100644
--- a/missing/getnameinfo.c
+++ b/missing/getnameinfo.c
@@ -41,9 +41,14 @@
 #include <config.h>
 #endif
 
+#include "tcpdump-stdinc.h"
+
+#include "interface.h"
+
+
 #ifndef lint
 static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/missing/getnameinfo.c,v 1.9 2002-06-11 17:13:37 itojun Exp $";
+     "@(#) $Header: /tcpdump/master/tcpdump/missing/getnameinfo.c,v 1.10 2003-11-15 00:39:47 guy Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/missing/inet_aton.c b/missing/inet_aton.c
index 5d71e066..a35312a8 100644
--- a/missing/inet_aton.c
+++ b/missing/inet_aton.c
@@ -36,15 +36,19 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: inet_aton.c,v 1.4 2002-08-01 08:53:38 risso Exp $ */
+/* $Id: inet_aton.c,v 1.5 2003-11-15 00:39:47 guy Exp $ */
 
-#ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/missing/inet_aton.c,v 1.4 2002-08-01 08:53:38 risso Exp $";
-#endif
 
 #include <tcpdump-stdinc.h>
 
+
+#include "interface.h"
+
+#ifndef lint
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/missing/inet_aton.c,v 1.5 2003-11-15 00:39:47 guy Exp $";
+#endif
+
 /* Minimal implementation of inet_aton.
  * Cannot distinguish between failure and a local broadcast address. */
 
diff --git a/missing/inet_ntop.c b/missing/inet_ntop.c
index 811db5de..0c2a4877 100644
--- a/missing/inet_ntop.c
+++ b/missing/inet_ntop.c
@@ -36,15 +36,19 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: inet_ntop.c,v 1.5 2002-08-01 08:53:39 risso Exp $ */
+/* $Id: inet_ntop.c,v 1.6 2003-11-15 00:39:48 guy Exp $ */
 
-#ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/missing/inet_ntop.c,v 1.5 2002-08-01 08:53:39 risso Exp $";
-#endif
 
 #include <tcpdump-stdinc.h>
 
+
+#include "interface.h"
+
+#ifndef lint
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/missing/inet_ntop.c,v 1.6 2003-11-15 00:39:48 guy Exp $";
+#endif
+
 #include <stdio.h>
 #include <errno.h>
 
diff --git a/missing/inet_pton.c b/missing/inet_pton.c
index 7608e7be..5d35bc80 100644
--- a/missing/inet_pton.c
+++ b/missing/inet_pton.c
@@ -36,15 +36,19 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: inet_pton.c,v 1.4 2002-08-01 08:53:40 risso Exp $ */
+/* $Id: inet_pton.c,v 1.5 2003-11-15 00:39:48 guy Exp $ */
 
-#ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/missing/inet_pton.c,v 1.4 2002-08-01 08:53:40 risso Exp $";
-#endif
 
 #include <tcpdump-stdinc.h>
 
+
+#include "interface.h"
+
+#ifndef lint
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/missing/inet_pton.c,v 1.5 2003-11-15 00:39:48 guy Exp $";
+#endif
+
 #include <errno.h>
 
 int
diff --git a/missing/snprintf.c b/missing/snprintf.c
index 8e5994c4..4a6bf11d 100644
--- a/missing/snprintf.c
+++ b/missing/snprintf.c
@@ -31,16 +31,12 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: snprintf.c,v 1.6 2002-06-11 17:13:39 itojun Exp $ */
+/* $Id: snprintf.c,v 1.7 2003-11-15 00:39:48 guy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
-#ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/missing/snprintf.c,v 1.6 2002-06-11 17:13:39 itojun Exp $";
-#endif
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -51,6 +47,10 @@ static const char rcsid[] =
 
 #include <interface.h>
 
+#ifndef lint
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/missing/snprintf.c,v 1.7 2003-11-15 00:39:48 guy Exp $";
+#endif
 enum format_flags {
     minus_flag     =  1,
     plus_flag      =  2,
diff --git a/missing/strlcat.c b/missing/strlcat.c
index 89878df0..1497883e 100644
--- a/missing/strlcat.c
+++ b/missing/strlcat.c
@@ -28,10 +28,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/missing/strlcat.c,v 1.3 2002-08-02 04:38:12 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H 
 #include <config.h>
@@ -39,6 +35,14 @@ static const char rcsid[] =
 
 #include <tcpdump-stdinc.h>
 
+
+#include "interface.h"
+
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/missing/strlcat.c,v 1.4 2003-11-15 00:39:48 guy Exp $ (LBL)";
+#endif
+
 #include <string.h>
 
 /*
diff --git a/missing/strlcpy.c b/missing/strlcpy.c
index 793605d1..dec09fe7 100644
--- a/missing/strlcpy.c
+++ b/missing/strlcpy.c
@@ -28,10 +28,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/missing/strlcpy.c,v 1.3 2002-08-02 04:38:13 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H 
 #include <config.h>
@@ -39,6 +35,14 @@ static const char rcsid[] =
 
 #include <tcpdump-stdinc.h>
 
+
+#include "interface.h"
+
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/missing/strlcpy.c,v 1.4 2003-11-15 00:39:48 guy Exp $ (LBL)";
+#endif
+
 #include <string.h>
 
 /*