fix for #1582

diff --git a/ChangeLog b/ChangeLog
index a1516a28442316eb1ef25b3c82ec607202d4d2bf..4f7adbc512020624295d06c792ad330483e0e538 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,7 +48,8 @@ February 26, 2009
                1496, 1499, 1500, 1501, 1502, 1503, 1505, 1509, 1513, 1521,
                1523, 1525, 1530, 1531, 1532, 1533, 1535, 1536, 1539, 1540,
                1542, 1543, 1546, 1547, 1551, 1553, 1554, 1561, 1565, 1566, 
-               1568, 1569, 1570, 1571, 1573, 1577, 1578, 1579, 1580,
+               1568, 1569, 1570, 1571, 1573, 1577, 1578, 1579, 1580, 1581,
+               1582
                
 
 August 2, 2008

diff --git a/lib/graph/attribs.c b/lib/graph/attribs.c
index 72954d63c0ab553d4daa68e0153b1a1626471619..03a1aee009714226f723336e7219f4e32b39842d 100644 (file)
--- a/lib/graph/attribs.c
+++ b/lib/graph/attribs.c
@@ -324,6 +324,14 @@ 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 */
+static int agferror(FILE *stream)
+{
+    return ferror(stream);
+}
+#endif
+
        /* this is normally called by the aginit() macro */
 void aginitlib(int gs, int ns, int es)
 {
@@ -333,7 +341,12 @@ 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)
+#undef ferror
+       AG.ferror = agferror; /* init to ferror macro wrapper function */
+#else
        AG.ferror = ferror;   /* init to system version of ferror() */
+#endif
        initproto();
     } else
        if ((AG.graph_nbytes != gs) || (AG.node_nbytes != ns)

diff --git a/lib/graph/graphio.c b/lib/graph/graphio.c
index f97d4d3d37cb0bcf9d9ad3296c9de0b33ee66f02..2186588bcf06b637e369050a62955f5d75ac15db 100644 (file)
--- a/lib/graph/graphio.c
+++ b/lib/graph/graphio.c
@@ -183,7 +183,10 @@ void agsetodisc(
 )
 {
     AG.fwrite = myfwrite;
+#if defined(__SUNPRO_C)
+#undef ferror
     AG.ferror = myferror;
+#endif
 }
 
 /* agfprintf: