[src/trunk]: src Fix build on Solaris 10.

[nakayama <nakayama%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3e6266bcfd81
branches:  trunk
changeset: 762857:3e6266bcfd81
user:      nakayama <nakayama%NetBSD.org@localhost>
date:      Thu Mar 03 14:53:01 2011 +0000

description:
Fix build on Solaris 10.

diffstat:

 external/bsd/mdocml/dist/tbl.c        |  4 ++++
 external/bsd/mdocml/dist/tbl_layout.c |  4 ++++
 external/bsd/mdocml/dist/tbl_opts.c   |  4 ++++
 tools/zic/Makefile                    |  4 ++--
 usr.bin/config/mkioconf.c             |  4 ++--
 usr.bin/make/parse.c                  |  9 ++++++---
 6 files changed, 22 insertions(+), 7 deletions(-)

diffs (111 lines):

diff -r 5e1d2861cd50 -r 3e6266bcfd81 external/bsd/mdocml/dist/tbl.c
--- a/external/bsd/mdocml/dist/tbl.c    Thu Mar 03 11:54:57 2011 +0000
+++ b/external/bsd/mdocml/dist/tbl.c    Thu Mar 03 14:53:01 2011 +0000
@@ -14,6 +14,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff -r 5e1d2861cd50 -r 3e6266bcfd81 external/bsd/mdocml/dist/tbl_layout.c
--- a/external/bsd/mdocml/dist/tbl_layout.c     Thu Mar 03 11:54:57 2011 +0000
+++ b/external/bsd/mdocml/dist/tbl_layout.c     Thu Mar 03 14:53:01 2011 +0000
@@ -14,6 +14,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <assert.h>
 #include <ctype.h>
 #include <stdlib.h>
diff -r 5e1d2861cd50 -r 3e6266bcfd81 external/bsd/mdocml/dist/tbl_opts.c
--- a/external/bsd/mdocml/dist/tbl_opts.c       Thu Mar 03 11:54:57 2011 +0000
+++ b/external/bsd/mdocml/dist/tbl_opts.c       Thu Mar 03 14:53:01 2011 +0000
@@ -14,6 +14,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
diff -r 5e1d2861cd50 -r 3e6266bcfd81 tools/zic/Makefile
--- a/tools/zic/Makefile        Thu Mar 03 11:54:57 2011 +0000
+++ b/tools/zic/Makefile        Thu Mar 03 14:53:01 2011 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: Makefile,v 1.5 2010/03/07 19:10:10 hans Exp $
+#      $NetBSD: Makefile,v 1.6 2011/03/03 14:53:01 nakayama Exp $
 
 HOSTPROGNAME=  ${_TOOL_PREFIX}zic
 HOST_SRCDIR=   usr.sbin/zic
 
-.if !empty(HOST_OSTYPE:MSunOS-5.11-*)
+.if !empty(HOST_OSTYPE:MSunOS-5.1[01]-*)
 HOST_CPPFLAGS= -D_POSIX_PTHREAD_SEMANTICS
 .endif
 
diff -r 5e1d2861cd50 -r 3e6266bcfd81 usr.bin/config/mkioconf.c
--- a/usr.bin/config/mkioconf.c Thu Mar 03 11:54:57 2011 +0000
+++ b/usr.bin/config/mkioconf.c Thu Mar 03 14:53:01 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mkioconf.c,v 1.18 2010/03/26 15:51:17 pooka Exp $      */
+/*     $NetBSD: mkioconf.c,v 1.19 2011/03/03 14:53:01 nakayama Exp $   */
 
 /*
  * Copyright (c) 1992, 1993
@@ -143,7 +143,7 @@
        autogen_comment(ofp, "ioconf.c");
 
        (void)snprintf(ifnbuf, sizeof(ifnbuf), "arch/%s/conf/ioconf.incl.%s",
-           machine, machine);
+           machine ? machine : "(null)", machine ? machine : "(null)");
        ifn = sourcepath(ifnbuf);
        if ((ifp = fopen(ifn, "r")) != NULL) {
                while ((n = fread(buf, 1, sizeof(buf), ifp)) > 0)
diff -r 5e1d2861cd50 -r 3e6266bcfd81 usr.bin/make/parse.c
--- a/usr.bin/make/parse.c      Thu Mar 03 11:54:57 2011 +0000
+++ b/usr.bin/make/parse.c      Thu Mar 03 14:53:01 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: parse.c,v 1.176 2011/02/20 23:12:09 joerg Exp $        */
+/*     $NetBSD: parse.c,v 1.177 2011/03/03 14:53:02 nakayama Exp $     */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: parse.c,v 1.176 2011/02/20 23:12:09 joerg Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.177 2011/03/03 14:53:02 nakayama Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)parse.c    8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: parse.c,v 1.176 2011/02/20 23:12:09 joerg Exp $");
+__RCSID("$NetBSD: parse.c,v 1.177 2011/03/03 14:53:02 nakayama Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -133,6 +133,9 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#ifndef MAP_FILE
+#define MAP_FILE 0
+#endif
 #ifndef MAP_COPY
 #define MAP_COPY MAP_PRIVATE
 #endif