Have the configure script arrange that the Makefile define _U_

appropriately, and that GNUmakefile and the MSVC++ project file define
it apppriately, as we do with libpcap, rather than defining it in
"interface.h".

Undo the rcsid-shuffling and addition of extra #includes, as we no
longer need to arrange that "interface.h" be included before using _U_
in an RCS ID or copyright.

10 files changed, 38 insertions, 74 deletions

diff --git a/missing/datalinks.c b/missing/datalinks.c
index 36eb1c46..1bd86448 100644
--- a/missing/datalinks.c
+++ b/missing/datalinks.c
@@ -31,19 +31,17 @@
  * SUCH DAMAGE.
  */
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/missing/datalinks.c,v 1.3 2003-11-16 09:36:47 guy Exp $ (LBL)";
+#endif
+
 #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 9dececf6..e2623b04 100644
--- a/missing/dlnames.c
+++ b/missing/dlnames.c
@@ -31,6 +31,10 @@
  * SUCH DAMAGE.
  */
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/missing/dlnames.c,v 1.4 2003-11-16 09:36:47 guy Exp $ (LBL)";
+#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -38,14 +42,6 @@
 
 #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 e37f9363..f59b2c4e 100644
--- a/missing/getaddrinfo.c
+++ b/missing/getaddrinfo.c
@@ -49,14 +49,9 @@
 #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.12 2003-11-15 00:39:47 guy Exp $";
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/missing/getaddrinfo.c,v 1.13 2003-11-16 09:36:48 guy Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/missing/getnameinfo.c b/missing/getnameinfo.c
index f37e6b13..c287221c 100644
--- a/missing/getnameinfo.c
+++ b/missing/getnameinfo.c
@@ -41,14 +41,9 @@
 #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.10 2003-11-15 00:39:47 guy Exp $";
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/missing/getnameinfo.c,v 1.11 2003-11-16 09:36:49 guy Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/missing/inet_aton.c b/missing/inet_aton.c
index a35312a8..bc1461aa 100644
--- a/missing/inet_aton.c
+++ b/missing/inet_aton.c
@@ -36,19 +36,15 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: inet_aton.c,v 1.5 2003-11-15 00:39:47 guy Exp $ */
-
-
-#include <tcpdump-stdinc.h>
-
-
-#include "interface.h"
+/* $Id: inet_aton.c,v 1.6 2003-11-16 09:36:49 guy Exp $ */
 
 #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 $";
+     "@(#) $Header: /tcpdump/master/tcpdump/missing/inet_aton.c,v 1.6 2003-11-16 09:36:49 guy Exp $";
 #endif
 
+#include <tcpdump-stdinc.h>
+
 /* 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 0c2a4877..30dff51e 100644
--- a/missing/inet_ntop.c
+++ b/missing/inet_ntop.c
@@ -36,19 +36,15 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: inet_ntop.c,v 1.6 2003-11-15 00:39:48 guy Exp $ */
-
-
-#include <tcpdump-stdinc.h>
-
-
-#include "interface.h"
+/* $Id: inet_ntop.c,v 1.7 2003-11-16 09:36:50 guy Exp $ */
 
 #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 $";
+     "@(#) $Header: /tcpdump/master/tcpdump/missing/inet_ntop.c,v 1.7 2003-11-16 09:36:50 guy Exp $";
 #endif
 
+#include <tcpdump-stdinc.h>
+
 #include <stdio.h>
 #include <errno.h>
 
diff --git a/missing/inet_pton.c b/missing/inet_pton.c
index 5d35bc80..83f67e1e 100644
--- a/missing/inet_pton.c
+++ b/missing/inet_pton.c
@@ -36,19 +36,15 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: inet_pton.c,v 1.5 2003-11-15 00:39:48 guy Exp $ */
-
-
-#include <tcpdump-stdinc.h>
-
-
-#include "interface.h"
+/* $Id: inet_pton.c,v 1.6 2003-11-16 09:36:51 guy Exp $ */
 
 #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 $";
+     "@(#) $Header: /tcpdump/master/tcpdump/missing/inet_pton.c,v 1.6 2003-11-16 09:36:51 guy Exp $";
 #endif
 
+#include <tcpdump-stdinc.h>
+
 #include <errno.h>
 
 int
diff --git a/missing/snprintf.c b/missing/snprintf.c
index 4a6bf11d..79329977 100644
--- a/missing/snprintf.c
+++ b/missing/snprintf.c
@@ -31,12 +31,16 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: snprintf.c,v 1.7 2003-11-15 00:39:48 guy Exp $ */
+/* $Id: snprintf.c,v 1.8 2003-11-16 09:36:51 guy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
+#ifndef lint
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/missing/snprintf.c,v 1.8 2003-11-16 09:36:51 guy Exp $";
+#endif
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -47,10 +51,6 @@
 
 #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 1497883e..a3d3face 100644
--- a/missing/strlcat.c
+++ b/missing/strlcat.c
@@ -28,6 +28,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/missing/strlcat.c,v 1.5 2003-11-16 09:36:51 guy Exp $ (LBL)";
+#endif
 
 #ifdef HAVE_CONFIG_H 
 #include <config.h>
@@ -35,14 +39,6 @@
 
 #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 dec09fe7..a92e4d13 100644
--- a/missing/strlcpy.c
+++ b/missing/strlcpy.c
@@ -28,6 +28,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/missing/strlcpy.c,v 1.5 2003-11-16 09:36:52 guy Exp $ (LBL)";
+#endif
 
 #ifdef HAVE_CONFIG_H 
 #include <config.h>
@@ -35,14 +39,6 @@
 
 #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>
 
 /*