commit 0fe296019746689551d224a5f6fb7e0ebe1b91dc
author Behdad Esfahbod <behdad@behdad.org> Sat Sep 17 09:59:58 2011 -0400
committer Behdad Esfahbod <behdad@behdad.org> Sat Sep 17 09:59:58 2011 -0400
tree 8b231c2c4d8e7b2eab329ae41b9b86b8d5acd2bb
parent d2b3ab9ecebbf46cb9dac1f09c17379c50ea4575

Fix Linux build when io.h is available

Bug 40953 - fail compile git: make[2]: *** [hb_view-options.o] Error 1

configure.ac

diff --git a/configure.ac b/configure.ac
index e1b6bf8..ac41742 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,7 @@
 GTK_DOC_CHECK([1.15],[--flavour no-tmpl])
 
 # Functions and headers
-AC_CHECK_FUNCS(mprotect sysconf getpagesize mmap)
+AC_CHECK_FUNCS(mprotect sysconf getpagesize mmap _setmode)
 AC_CHECK_HEADERS(unistd.h sys/mman.h io.h)
 
 # Compiler flags

util/options.cc

diff --git a/util/options.cc b/util/options.cc
index a923a98..fe2feaf 100644
--- a/util/options.cc
+++ b/util/options.cc
@@ -439,8 +439,8 @@
       /* read it */
       GString *gs = g_string_new (NULL);
       char buf[BUFSIZ];
-#ifdef HAVE_IO_H
-      _setmode (fileno (stdin), O_BINARY);
+#ifdef HAVE__SETMODE
+      _setmode (fileno (stdin), _O_BINARY);
 #endif
       while (!feof (stdin)) {
 	size_t ret = fread (buf, 1, sizeof (buf), stdin);
@@ -579,8 +579,8 @@
   if (output_file)
     fp = fopen (output_file, "wb");
   else {
-#ifdef HAVE_IO_H
-    _setmode (fileno (stdout), O_BINARY);
+#ifdef HAVE__SETMODE
+    _setmode (fileno (stdout), _O_BINARY);
 #endif
     fp = stdout;
   }