config.h.in | 6 +++--- configure.ac | 2 +- util/options.cc | 2 +- util/options.hh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit bc76449f51f20491a4540b4f240f5a3e0dcb20fe Author: Behdad Esfahbod <beh...@behdad.org> Date: Thu Jan 31 18:18:05 2013 -0500 Use setmode() instead of _setmode() Looks like Cygwin / MSVC declare it that way, and it still works on MinGW32 cross. diff --git a/config.h.in b/config.h.in index 4b5c99a..fe2ebcb 100644 --- a/config.h.in +++ b/config.h.in @@ -81,6 +81,9 @@ /* Have sched_yield */ #undef HAVE_SCHED_YIELD +/* Define to 1 if you have the `setmode' function. */ +#undef HAVE_SETMODE + /* Have Solaris __machine_*_barrier and atomic_* operations */ #undef HAVE_SOLARIS_ATOMIC_OPS @@ -117,9 +120,6 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if you have the `_setmode' function. */ -#undef HAVE__SETMODE - /* Define to the sub-directory in which libtool stores uninstalled libraries. */ #undef LT_OBJDIR diff --git a/configure.ac b/configure.ac index 202bef9..40e7837 100644 --- a/configure.ac +++ b/configure.ac @@ -55,7 +55,7 @@ dnl GOBJECT_INTROSPECTION_CHECK([0.9.0]) dnl GTK_DOC_CHECK([1.15],[--flavour no-tmpl]) # Functions and headers -AC_CHECK_FUNCS(atexit mprotect sysconf getpagesize mmap _setmode isatty) +AC_CHECK_FUNCS(atexit mprotect sysconf getpagesize mmap setmode isatty) AC_CHECK_HEADERS(unistd.h sys/mman.h io.h) # Compiler flags diff --git a/util/options.cc b/util/options.cc index 17ad8e6..c9deb0d 100644 --- a/util/options.cc +++ b/util/options.cc @@ -414,7 +414,7 @@ font_options_t::get_font (void) const GString *gs = g_string_new (NULL); char buf[BUFSIZ]; #ifdef HAVE__SETMODE - _setmode (fileno (stdin), _O_BINARY); + setmode (fileno (stdin), _O_BINARY); #endif while (!feof (stdin)) { size_t ret = fread (buf, 1, sizeof (buf), stdin); diff --git a/util/options.hh b/util/options.hh index ad925b2..298a3f2 100644 --- a/util/options.hh +++ b/util/options.hh @@ -44,7 +44,7 @@ #include <unistd.h> /* for isatty() */ #endif #ifdef HAVE_IO_H -#include <io.h> /* for _setmode() under Windows */ +#include <io.h> /* for setmode() under Windows */ #endif #include <hb.h> _______________________________________________ HarfBuzz mailing list HarfBuzz@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/harfbuzz