From: ellson <devnull@localhost>
Date: Thu, 26 Feb 2009 16:21:09 +0000 (+0000)
Subject: improved fix for #1582 from Rick Fankel
X-Git-Tag: LAST_LIBGRAPH~32^2~2388
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=29264793ad6634cef4cf036a4d001a6f16343c64;p=graphviz

improved fix for #1582 from Rick Fankel
---

diff --git a/configure.ac b/configure.ac
index d29445d7a..aa3059229 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1796,7 +1796,7 @@ CPPFLAGS=$save_CPPFLAGS
 AC_SUBST(XAW_INCLUDES)
 AC_SUBST(XAW_LIBS)
 AM_CONDITIONAL(WITH_XAW, [test "x$with_xaw" != "xno"])
-if test "x$with_xaw" = "xno" && "x$no_x" != xyes; then
+if test "x$with_xaw" = "xno" && "$no_x" != yes; then
 	AC_MSG_WARN(Lefty cannot be built)
 fi
 
diff --git a/lib/graph/attribs.c b/lib/graph/attribs.c
index 03a1aee00..d735f6b0e 100644
--- a/lib/graph/attribs.c
+++ b/lib/graph/attribs.c
@@ -324,8 +324,8 @@ Agsym_t *agprvattr(void *obj, Agsym_t *a)
 	return (Agsym_t *)dtprev(dict->dict, a);
 }
 
-#if defined(__SUNPRO_C)
-/* on Sun's, ferror is a macro */
+#if defined(__SUNPRO_C) || defined(__CYGWIN__)
+/* for systems where ferror is a macro */
 static int agferror(FILE *stream)
 {
     return ferror(stream);
@@ -341,7 +341,7 @@ void aginitlib(int gs, int ns, int es)
 	AG.edge_nbytes = es;
 	AG.init_called = TRUE;
 	AG.fwrite = fwrite;   /* init to system version of fwrite() */
-#if defined(__SUNPRO_C)
+#if defined(__SUNPRO_C) || defined(__CYGWIN__)
 #undef ferror
 	AG.ferror = agferror; /* init to ferror macro wrapper function */
 #else
diff --git a/lib/graph/graphio.c b/lib/graph/graphio.c
index 08b29dc6b..798827614 100644
--- a/lib/graph/graphio.c
+++ b/lib/graph/graphio.c
@@ -185,7 +185,7 @@ void agsetiodisc(
 {
     if (myfread) AG.fread = myfread;
     if (myfwrite) AG.fwrite = myfwrite;
-#if defined(__SUNPRO_C)
+#if defined(__SUNPRO_C) || defined(__CYGWIN__)
 #undef ferror
 #endif
     if (myferror) AG.ferror = myferror;