improved fix for #1582 from Rick Fankel

diff --git a/configure.ac b/configure.ac
index d29445d7ac18c84183cbc6bd25acbadb8df18679..aa3059229d6f0de5575fbc5f5a7cde7a4abd91d6 100644 (file)
--- 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 03a1aee009714226f723336e7219f4e32b39842d..d735f6b0e8b6fed1fa065b2d3d7beec39ae57341 100644 (file)
--- 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 08b29dc6bce12753efa84d459f9e17e3a5c0ee82..798827614d9da83caecc006e8eb8bf00129d1bc9 100644 (file)
--- 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;