Module Name: src
Committed By: matt
Date: Wed Apr 21 05:27:00 UTC 2010
Modified Files:
src/tools/compat [matt-nb5-mips64]: compat_defs.h getmode.c
Log Message:
sync to netbsd-5
To generate a diff of this commit:
cvs rdiff -u -r1.67.2.1 -r1.67.2.1.4.1 src/tools/compat/compat_defs.h
cvs rdiff -u -r1.7 -r1.7.10.1 src/tools/compat/getmode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/compat/compat_defs.h
diff -u src/tools/compat/compat_defs.h:1.67.2.1 src/tools/compat/compat_defs.h:1.67.2.1.4.1
--- src/tools/compat/compat_defs.h:1.67.2.1 Thu Jan 15 04:32:35 2009
+++ src/tools/compat/compat_defs.h Wed Apr 21 05:27:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_defs.h,v 1.67.2.1 2009/01/15 04:32:35 snj Exp $ */
+/* $NetBSD: compat_defs.h,v 1.67.2.1.4.1 2010/04/21 05:27:00 matt Exp $ */
#ifndef __NETBSD_COMPAT_DEFS_H__
#define __NETBSD_COMPAT_DEFS_H__
@@ -38,7 +38,6 @@
#include <sys/stat.h>
#include <errno.h>
#include <fcntl.h>
-#include <grp.h>
#include <limits.h>
#include <paths.h>
#include <stdarg.h>
@@ -76,6 +75,9 @@
/* We don't include <pwd.h> here, so that "compat_pwd.h" works. */
struct passwd;
+/* We don't include <grp.h> here, so that "compat_pwd.h" works. */
+struct group;
+
/* Assume an ANSI compiler for the host. */
#undef __P
Index: src/tools/compat/getmode.c
diff -u src/tools/compat/getmode.c:1.7 src/tools/compat/getmode.c:1.7.10.1
--- src/tools/compat/getmode.c:1.7 Mon Apr 28 20:24:12 2008
+++ src/tools/compat/getmode.c Wed Apr 21 05:27:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: getmode.c,v 1.7 2008/04/28 20:24:12 martin Exp $ */
+/* $NetBSD: getmode.c,v 1.7.10.1 2010/04/21 05:27:00 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,6 +31,7 @@
#include "nbtool_config.h"
#include <stdlib.h>
+#include <unistd.h>
void *
setmode(const char *str)
