2010-01-08 Robert Millan <rmh.grub@aybabtu.com>

	* src/mkisofs.c: Remove `ifdef linux' portability kludge.

diff --git a/ChangeLog b/ChangeLog
index b1f35e795efc675948eab977a50bf2a10dba0055..e91e8753642415cfab72e35ba925ade969f755ec 100644 (file)
--- 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 b6084a24a80ee30e5f993ee58f0aeef1c21c94c6..69b4b3d0d8253729b4a9749dfffd1cba910d39fa 100644 (file)
--- 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>