Module Name: src
Committed By: tsutsui
Date: Sat Sep 27 15:21:40 UTC 2014
Modified Files:
src/distrib/cdrom/macppc_installboot: cd9660.c cd9660_util.c
Log Message:
Include <dirent.h> instead of <sys/dirent.h> for POSIX compliancy.
Fixes build errors on Linux, tested on CentOS.
The problem was pointed out by Valery Ushakov.
Note <sys/param.h> will be prepared by src/tools/compat/configure.
XXX: not sure if we still need this dumb tool for a TierII port...
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/cdrom/macppc_installboot/cd9660.c
cvs rdiff -u -r1.2 -r1.3 src/distrib/cdrom/macppc_installboot/cd9660_util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/cdrom/macppc_installboot/cd9660.c
diff -u src/distrib/cdrom/macppc_installboot/cd9660.c:1.3 src/distrib/cdrom/macppc_installboot/cd9660.c:1.4
--- src/distrib/cdrom/macppc_installboot/cd9660.c:1.3 Wed May 14 13:29:27 2008
+++ src/distrib/cdrom/macppc_installboot/cd9660.c Sat Sep 27 15:21:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660.c,v 1.3 2008/05/14 13:29:27 tsutsui Exp $ */
+/* $NetBSD: cd9660.c,v 1.4 2014/09/27 15:21:40 tsutsui Exp $ */
/*-
* Copyright (c) 2005 Izumi Tsutsui. All rights reserved.
@@ -30,11 +30,10 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: cd9660.c,v 1.3 2008/05/14 13:29:27 tsutsui Exp $");
+__RCSID("$NetBSD: cd9660.c,v 1.4 2014/09/27 15:21:40 tsutsui Exp $");
#endif /* !__lint */
#include <sys/param.h>
-#include <sys/dirent.h>
#if !HAVE_NBTOOL_CONFIG_H
#include <sys/mount.h>
@@ -49,6 +48,7 @@ __RCSID("$NetBSD: cd9660.c,v 1.3 2008/05
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <dirent.h>
#include <fs/cd9660/iso.h>
Index: src/distrib/cdrom/macppc_installboot/cd9660_util.c
diff -u src/distrib/cdrom/macppc_installboot/cd9660_util.c:1.2 src/distrib/cdrom/macppc_installboot/cd9660_util.c:1.3
--- src/distrib/cdrom/macppc_installboot/cd9660_util.c:1.2 Wed Mar 25 15:26:49 2009
+++ src/distrib/cdrom/macppc_installboot/cd9660_util.c Sat Sep 27 15:21:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_util.c,v 1.2 2009/03/25 15:26:49 tsutsui Exp $ */
+/* $NetBSD: cd9660_util.c,v 1.3 2014/09/27 15:21:40 tsutsui Exp $ */
/*-
* Copyright (c) 1994
@@ -42,9 +42,9 @@
#include "nbtool_config.h"
#endif
-#include <assert.h>
#include <sys/param.h>
-#include <sys/dirent.h>
+#include <assert.h>
+#include <dirent.h>
#include <fs/cd9660/iso.h>
#define KASSERT(x) assert(x) /* XXX for <fs/unicode.h> */
