Module Name: src
Committed By: enami
Date: Thu Jun 23 02:35:56 UTC 2011
Modified Files:
src/usr.sbin/makefs: cd9660.h
src/usr.sbin/makefs/cd9660: cd9660_eltorito.c
Log Message:
Move inclusion of sys/endian.h from cd9660_eltorito.c to cd9660.h
since actual user is not cd9660_eltorito.c but iso.h and
cd9660_eltorito.h.
Actually, include order/place of sys/endian.h doesn't matter on
netbsd since it is always included by sys/types.h but it's not
true on other system. This should fix cross build breakage on
freebsd introduced by rev. 1.16 of cd9660_eltorito.c.
Problem reported and fix suggested on twitter.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/makefs/cd9660.h
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/makefs/cd9660/cd9660_eltorito.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/makefs/cd9660.h
diff -u src/usr.sbin/makefs/cd9660.h:1.16 src/usr.sbin/makefs/cd9660.h:1.17
--- src/usr.sbin/makefs/cd9660.h:1.16 Sun May 22 21:51:39 2011
+++ src/usr.sbin/makefs/cd9660.h Thu Jun 23 02:35:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660.h,v 1.16 2011/05/22 21:51:39 christos Exp $ */
+/* $NetBSD: cd9660.h,v 1.17 2011/06/23 02:35:56 enami Exp $ */
/*
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -51,6 +51,7 @@
#include <limits.h>
#include <sys/queue.h>
#include <sys/param.h>
+#include <sys/endian.h>
#include "makefs.h"
#include "iso.h"
Index: src/usr.sbin/makefs/cd9660/cd9660_eltorito.c
diff -u src/usr.sbin/makefs/cd9660/cd9660_eltorito.c:1.16 src/usr.sbin/makefs/cd9660/cd9660_eltorito.c:1.17
--- src/usr.sbin/makefs/cd9660/cd9660_eltorito.c:1.16 Mon May 23 00:21:50 2011
+++ src/usr.sbin/makefs/cd9660/cd9660_eltorito.c Thu Jun 23 02:35:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_eltorito.c,v 1.16 2011/05/23 00:21:50 christos Exp $ */
+/* $NetBSD: cd9660_eltorito.c,v 1.17 2011/06/23 02:35:56 enami Exp $ */
/*
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -36,11 +36,9 @@
#include "cd9660.h"
#include "cd9660_eltorito.h"
-#include <sys/endian.h>
-
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: cd9660_eltorito.c,v 1.16 2011/05/23 00:21:50 christos Exp $");
+__RCSID("$NetBSD: cd9660_eltorito.c,v 1.17 2011/06/23 02:35:56 enami Exp $");
#endif /* !__lint */
#ifdef DEBUG
