Module Name: src
Committed By: nakayama
Date: Thu Mar 3 14:53:02 UTC 2011
Modified Files:
src/external/bsd/mdocml/dist: tbl.c tbl_layout.c tbl_opts.c
src/tools/zic: Makefile
src/usr.bin/config: mkioconf.c
src/usr.bin/make: parse.c
Log Message:
Fix build on Solaris 10.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/mdocml/dist/tbl.c \
src/external/bsd/mdocml/dist/tbl_layout.c \
src/external/bsd/mdocml/dist/tbl_opts.c
cvs rdiff -u -r1.5 -r1.6 src/tools/zic/Makefile
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/config/mkioconf.c
cvs rdiff -u -r1.176 -r1.177 src/usr.bin/make/parse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/mdocml/dist/tbl.c
diff -u src/external/bsd/mdocml/dist/tbl.c:1.1.1.1 src/external/bsd/mdocml/dist/tbl.c:1.2
--- src/external/bsd/mdocml/dist/tbl.c:1.1.1.1 Wed Jan 12 22:57:14 2011
+++ src/external/bsd/mdocml/dist/tbl.c Thu Mar 3 14:53:01 2011
@@ -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>
Index: src/external/bsd/mdocml/dist/tbl_layout.c
diff -u src/external/bsd/mdocml/dist/tbl_layout.c:1.1.1.1 src/external/bsd/mdocml/dist/tbl_layout.c:1.2
--- src/external/bsd/mdocml/dist/tbl_layout.c:1.1.1.1 Wed Jan 12 22:57:13 2011
+++ src/external/bsd/mdocml/dist/tbl_layout.c Thu Mar 3 14:53:01 2011
@@ -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>
Index: src/external/bsd/mdocml/dist/tbl_opts.c
diff -u src/external/bsd/mdocml/dist/tbl_opts.c:1.1.1.1 src/external/bsd/mdocml/dist/tbl_opts.c:1.2
--- src/external/bsd/mdocml/dist/tbl_opts.c:1.1.1.1 Wed Jan 12 22:57:13 2011
+++ src/external/bsd/mdocml/dist/tbl_opts.c Thu Mar 3 14:53:01 2011
@@ -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>
Index: src/tools/zic/Makefile
diff -u src/tools/zic/Makefile:1.5 src/tools/zic/Makefile:1.6
--- src/tools/zic/Makefile:1.5 Sun Mar 7 19:10:10 2010
+++ src/tools/zic/Makefile Thu Mar 3 14:53:01 2011
@@ -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
Index: src/usr.bin/config/mkioconf.c
diff -u src/usr.bin/config/mkioconf.c:1.18 src/usr.bin/config/mkioconf.c:1.19
--- src/usr.bin/config/mkioconf.c:1.18 Fri Mar 26 15:51:17 2010
+++ src/usr.bin/config/mkioconf.c Thu Mar 3 14:53:01 2011
@@ -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)
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.176 src/usr.bin/make/parse.c:1.177
--- src/usr.bin/make/parse.c:1.176 Sun Feb 20 23:12:09 2011
+++ src/usr.bin/make/parse.c Thu Mar 3 14:53:02 2011
@@ -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
