From 332146a9fc4e3d7b35e18227ee1373a0b5b0f622 Mon Sep 17 00:00:00 2001 From: "Emden R. Gansner" Date: Mon, 12 Aug 2013 17:05:57 -0400 Subject: [PATCH] Fix declaration of Verbose in sparse lib to fit with the one in common/globals.h --- lib/sparse/DotIO.c | 6 ++++++ lib/sparse/SparseMatrix.c | 2 -- lib/sparse/general.h | 8 ++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/sparse/DotIO.c b/lib/sparse/DotIO.c index 738062a0a..45d484311 100644 --- a/lib/sparse/DotIO.c +++ b/lib/sparse/DotIO.c @@ -27,6 +27,12 @@ typedef struct { #define ND_id(n) (((Agnodeinfo_t*)((n)->base.data))->id) +void +initGraph (Agraph_t* g) +{ + aginit(g, AGNODE, "nodeinfo", sizeof(Agnodeinfo_t), TRUE); +} + #if 0 static void posStr (int len_buf, char* buf, int dim, real* x, double sc) diff --git a/lib/sparse/SparseMatrix.c b/lib/sparse/SparseMatrix.c index 2c6914762..c077ce926 100644 --- a/lib/sparse/SparseMatrix.c +++ b/lib/sparse/SparseMatrix.c @@ -25,8 +25,6 @@ #include "PriorityQueue.h" #endif -extern int Verbose; - static size_t size_of_matrix_type(int type){ int size = 0; switch (type){ diff --git a/lib/sparse/general.h b/lib/sparse/general.h index 0d5e656a9..054f58fef 100644 --- a/lib/sparse/general.h +++ b/lib/sparse/general.h @@ -27,7 +27,7 @@ #include #include #include -#endif +#endif /* STANDALONE */ #define real double @@ -62,9 +62,7 @@ typedef unsigned int boolean; -extern int Verbose; - -#else +#else /* STANDALONE */ #define MALLOC gmalloc #define REALLOC grealloc #endif /* STANDALONE */ @@ -80,6 +78,8 @@ extern int Verbose; extern double _statistics[10]; #endif +extern unsigned char Verbose; + extern int irand(int n); extern real drand(void); extern int *random_permutation(int n);/* random permutation of 0 to n-1 */ -- 2.40.0