Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/makefs Move inclusion of sys/endian.h from cd9660_e...



details:   https://anonhg.NetBSD.org/src/rev/f7633a1ace00
branches:  trunk
changeset: 766452:f7633a1ace00
user:      enami <enami%NetBSD.org@localhost>
date:      Thu Jun 23 02:35:56 2011 +0000

description:
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.

diffstat:

 usr.sbin/makefs/cd9660.h                 |  3 ++-
 usr.sbin/makefs/cd9660/cd9660_eltorito.c |  6 ++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diffs (39 lines):

diff -r b2ecac8e1605 -r f7633a1ace00 usr.sbin/makefs/cd9660.h
--- a/usr.sbin/makefs/cd9660.h  Thu Jun 23 02:33:44 2011 +0000
+++ b/usr.sbin/makefs/cd9660.h  Thu Jun 23 02:35:56 2011 +0000
@@ -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"
diff -r b2ecac8e1605 -r f7633a1ace00 usr.sbin/makefs/cd9660/cd9660_eltorito.c
--- a/usr.sbin/makefs/cd9660/cd9660_eltorito.c  Thu Jun 23 02:33:44 2011 +0000
+++ b/usr.sbin/makefs/cd9660/cd9660_eltorito.c  Thu Jun 23 02:35:56 2011 +0000
@@ -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



Home | Main Index | Thread Index | Old Index