Fix compatibility with cgraph library

diff --git a/lib/neatogen/adjust.c b/lib/neatogen/adjust.c
index 9fe908ae779b2df0f2d0befa5685c3dc987bc932..9bef15874e5596f97d0a0db62986e63bfd05f84a 100644 (file)
--- a/lib/neatogen/adjust.c
+++ b/lib/neatogen/adjust.c
@@ -749,8 +749,9 @@ SparseMatrix makeMatrix(Agraph_t* g, int dim, SparseMatrix *D)
        /* edge length */
            if (symD) {
 #ifndef WITH_CGRAPH
-#else
                if (sscanf (agxget (e, symD->index), "%lf", &v) != 1) v = 1;
+#else
+               if (sscanf (agxget (e, symD), "%lf", &v) != 1) v = 1;
 #endif
                valD[i] = v;
            }

diff --git a/lib/sfdpgen/spring_electrical.c b/lib/sfdpgen/spring_electrical.c
index 7651b696dea162190a88eddf86322a234a8c024a..28d70a3cdad921310d7760b5266aca5d6771fd1e 100644 (file)
--- a/lib/sfdpgen/spring_electrical.c
+++ b/lib/sfdpgen/spring_electrical.c
@@ -11,6 +11,10 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "SparseMatrix.h"
 #include "spring_electrical.h"
 #include "QuadTree.h"