[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 util/options.cc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7cba8a673b4b436a737fc4ffe85dc84ddd2bf41f
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Jan 31 18:37:10 2013 -0500

    Fixup previous commit
    
    Now, it looks like this breaks Cygwin again.  Have to figure out what's
    going on.

diff --git a/util/options.cc b/util/options.cc
index c9deb0d..57531d5 100644
--- a/util/options.cc
+++ b/util/options.cc
@@ -413,7 +413,7 @@ font_options_t::get_font (void) const
       /* read it */
       GString *gs = g_string_new (NULL);
       char buf[BUFSIZ];
-#ifdef HAVE__SETMODE
+#ifdef HAVE_SETMODE
       setmode (fileno (stdin), _O_BINARY);
 #endif
       while (!feof (stdin)) {
@@ -557,7 +557,7 @@ output_options_t::get_file_handle (void)
   if (output_file)
     fp = fopen (output_file, "wb");
   else {
-#ifdef HAVE__SETMODE
+#ifdef HAVE_SETMODE
     _setmode (fileno (stdout), _O_BINARY);
 #endif
     fp = stdout;