From b394b2cab89ea8882345624286815ef1b9a81e88 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Fri, 8 Jan 2010 15:22:40 +0000
Subject: [PATCH] 2010-01-08  Robert Millan  <rmh.grub@aybabtu.com>

	* src/mkisofs.c: Remove `ifdef linux' portability kludge.
---
 ChangeLog              | 6 +++++-
 util/mkisofs/mkisofs.c | 5 -----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b1f35e795..e91e87536 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2010-01-08  Robert Millan  <rmh.mkisofs@aybabtu.com>
+2010-01-08  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* src/mkisofs.c: Remove `ifdef linux' portability kludge.
+
+2010-01-08  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* util/mkisofs/defaults.h (APPID_DEFAULT): Redefine using PACKAGE_NAME.
 	(SYSTEM_ID_DEFAULT): Set to "GNU" unconditionally.
diff --git a/util/mkisofs/mkisofs.c b/util/mkisofs/mkisofs.c
index b6084a24a..69b4b3d0d 100644
--- a/util/mkisofs/mkisofs.c
+++ b/util/mkisofs/mkisofs.c
@@ -26,12 +26,7 @@
 #include "config.h"
 #include "mkisofs.h"
 #include "match.h"
-
-#ifdef linux
-#include <getopt.h>
-#else
 #include "getopt.h"
-#endif
 
 #include "iso9660.h"
 #include <ctype.h>