summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authortv <tv@NetBSD.org>2002-01-31 22:43:33 +0000
committertv <tv@NetBSD.org>2002-01-31 22:43:33 +0000
commit9fbd88883c38d0c0fbfcbe66d76fe6b0fab3f9de (patch)
treeba0b5c4693e010d837ac72c604288b00e83366c4 /gnu
parent95407c5758ea80fc57ab5e021950b3acb7d729fc (diff)
Roll in fixes to permit cross-compiling from non-NetBSD hosts. This
round has been tested on Solaris/x86 and Linux hosts. * Add host tools cap_mkdb, ctags, m4, uudecode. * Protect __RCSID() and __COPYRIGHT() better. * Reduce the number of places that need to include "config.h", to keep sources closer to their "vanilla" versions. * Add more compat #defines and autoconf-checked functions.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/usr.sbin/mdsetimage/mdsetimage.c23
1 files changed, 9 insertions, 14 deletions
diff --git a/gnu/usr.sbin/mdsetimage/mdsetimage.c b/gnu/usr.sbin/mdsetimage/mdsetimage.c
index d14d2a62c38..a99c1a6b641 100644
--- a/gnu/usr.sbin/mdsetimage/mdsetimage.c
+++ b/gnu/usr.sbin/mdsetimage/mdsetimage.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mdsetimage.c,v 1.3 2002/01/21 19:22:53 tv Exp $ */
+/* $NetBSD: mdsetimage.c,v 1.4 2002/01/31 22:43:36 tv Exp $ */
/* from: NetBSD: mdsetimage.c,v 1.15 2001/03/21 23:46:48 cgd Exp $ */
/*
@@ -30,27 +30,26 @@
* <<Id: LICENSE_GC,v 1.1 2001/10/01 23:24:05 cgd Exp>>
*/
-#if HAVE_CONFIG_H
-#include "config.h"
-#else
-#define HAVE_ERR_H 1
-#endif
-
#include <sys/cdefs.h>
-#ifndef lint
+#if defined(__COPYRIGHT) && !defined(lint)
__COPYRIGHT(
"@(#) Copyright (c) 1996 Christopher G. Demetriou.\
All rights reserved.\n");
#endif /* not lint */
-#ifndef lint
-__RCSID("$NetBSD: mdsetimage.c,v 1.3 2002/01/21 19:22:53 tv Exp $");
+#if defined(__RCSID) && !defined(lint)
+__RCSID("$NetBSD: mdsetimage.c,v 1.4 2002/01/31 22:43:36 tv Exp $");
#endif /* not lint */
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <sys/types.h>
#include <sys/mman.h>
#include <sys/stat.h>
+#include <err.h>
#include <fcntl.h>
#include <limits.h>
#include <stdio.h>
@@ -59,10 +58,6 @@ __RCSID("$NetBSD: mdsetimage.c,v 1.3 2002/01/21 19:22:53 tv Exp $");
#include <bfd.h>
-#if HAVE_ERR_H
-#include <err.h>
-#endif
-
struct symbols {
char *name;
bfd_vma vma;