62a4b96915
2.32.0: - New version of xdot format, annotating gradient color schemes - Support for reading pdf images using poppler - Lefty/dotty/lneato now accept anonymous graphs - Add star node shape - Add two-tone (non-gradient) fill 2.30.1: - various build fixes 2.30.0: - Replaced libgraph with libcgraph; use of libgraph is now deprecated - New ranking algorithm that allows multiple subgraph constraints - Support edges using curved arcs. - Added new shapes used by the synthetic biology community. - For HTML-like labels, provide rounded cells, and dashed or dotted borders. - Add lcurve and rcurve arrowheads. - Add prototype pie chart and striped fills. - Support insets in treemaps to make containment clear - Add random rooted tree generation to gvgen - Allow GVPRPATH to specify that the default path be prepended or appended to it. - Support arbitrary lists of layers; allow the user to specify arbitrary layers for output. - A collection of gvpr scripts, which were part of the source package, are now installed in <prefix>/share/graphviz/gvpr, and the that path is used as part of th default built-in path for gvpr. - Update libexpr to reflect Glenn Fowler's changes including scopes for variables. - Add next graph variable to gvpr - Modify dot and fdp so that a cluster's margin attribute will affect OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=59
311 lines
8.4 KiB
Diff
311 lines
8.4 KiB
Diff
From: Philipp Thomas <pth@suse.de>
|
|
Date: 2013-09-03 12:15:17+02:00
|
|
Subject: Fix ifdef to get proper prototypes
|
|
References:
|
|
Upstream:
|
|
|
|
---
|
|
lib/cdt/dtclose.c | 2 +-
|
|
lib/cdt/dtdisc.c | 4 ++--
|
|
lib/cdt/dtextract.c | 2 +-
|
|
lib/cdt/dtflatten.c | 2 +-
|
|
lib/cdt/dthash.c | 4 ++--
|
|
lib/cdt/dtlist.c | 2 +-
|
|
lib/cdt/dtmethod.c | 2 +-
|
|
lib/cdt/dtopen.c | 2 +-
|
|
lib/cdt/dtrenew.c | 2 +-
|
|
lib/cdt/dtrestore.c | 2 +-
|
|
lib/cdt/dtsize.c | 4 ++--
|
|
lib/cdt/dtstat.c | 6 +++---
|
|
lib/cdt/dtstrhash.c | 2 +-
|
|
lib/cdt/dttree.c | 2 +-
|
|
lib/cdt/dttreeset.c | 4 ++--
|
|
lib/cdt/dtview.c | 4 ++--
|
|
lib/cdt/dtwalk.c | 2 +-
|
|
17 files changed, 24 insertions(+), 24 deletions(-)
|
|
|
|
Index: lib/cdt/dtclose.c
|
|
===================================================================
|
|
--- lib/cdt/dtclose.c.orig 2013-08-01 19:35:15.000000000 +0200
|
|
+++ lib/cdt/dtclose.c 2013-09-03 12:13:04.701648435 +0200
|
|
@@ -4,7 +4,7 @@
|
|
**
|
|
** Written by Kiem-Phong Vo (05/25/96)
|
|
*/
|
|
-#if __STD_C
|
|
+#if __STDC__
|
|
int dtclose(reg Dt_t* dt)
|
|
#else
|
|
int dtclose(dt)
|
|
Index: lib/cdt/dtdisc.c
|
|
===================================================================
|
|
--- lib/cdt/dtdisc.c.orig 2013-08-01 19:35:15.000000000 +0200
|
|
+++ lib/cdt/dtdisc.c 2013-09-03 12:11:34.206821178 +0200
|
|
@@ -7,7 +7,7 @@
|
|
** Written by Kiem-Phong Vo (5/26/96)
|
|
*/
|
|
|
|
-#if __STD_C
|
|
+#if __STDC__
|
|
static Void_t* dtmemory(Dt_t* dt,Void_t* addr,size_t size,Dtdisc_t* disc)
|
|
#else
|
|
static Void_t* dtmemory(dt, addr, size, disc)
|
|
@@ -27,7 +27,7 @@ Dtdisc_t* disc; /* discipline */
|
|
else return size > 0 ? malloc(size) : NIL(Void_t*);
|
|
}
|
|
|
|
-#if __STD_C
|
|
+#if __STDC__
|
|
Dtdisc_t* dtdisc(Dt_t* dt, Dtdisc_t* disc, int type)
|
|
#else
|
|
Dtdisc_t* dtdisc(dt,disc,type)
|
|
Index: lib/cdt/dtextract.c
|
|
===================================================================
|
|
--- lib/cdt/dtextract.c.orig 2013-08-01 19:35:15.000000000 +0200
|
|
+++ lib/cdt/dtextract.c 2013-09-03 12:13:07.405583542 +0200
|
|
@@ -5,7 +5,7 @@
|
|
** Written by Kiem-Phong Vo (5/25/96).
|
|
*/
|
|
|
|
-#if __STD_C
|
|
+#if __STDC__
|
|
Dtlink_t* dtextract(reg Dt_t* dt)
|
|
#else
|
|
Dtlink_t* dtextract(dt)
|
|
Index: lib/cdt/dtflatten.c
|
|
===================================================================
|
|
--- lib/cdt/dtflatten.c.orig 2013-08-01 19:35:15.000000000 +0200
|
|
+++ lib/cdt/dtflatten.c 2013-09-03 12:13:11.838477158 +0200
|
|
@@ -6,7 +6,7 @@
|
|
** Written by Kiem-Phong Vo (5/25/96).
|
|
*/
|
|
|
|
-#if __STD_C
|
|
+#if __STDC__
|
|
Dtlink_t* dtflatten(Dt_t* dt)
|
|
#else
|
|
Dtlink_t* dtflatten(dt)
|
|
Index: lib/cdt/dthash.c
|
|
===================================================================
|
|
--- lib/cdt/dthash.c.orig 2013-08-01 19:35:15.000000000 +0200
|
|
+++ lib/cdt/dthash.c 2013-09-03 12:12:01.702160840 +0200
|
|
@@ -9,7 +9,7 @@
|
|
*/
|
|
|
|
/* resize the hash table */
|
|
-#if __STD_C
|
|
+#if __STDC__
|
|
static void dthtab(Dt_t* dt)
|
|
#else
|
|
static void dthtab(dt)
|
|
@@ -75,7 +75,7 @@ Dt_t* dt;
|
|
}
|
|
}
|
|
|
|
-#if __STD_C
|
|
+#if __STDC__
|
|
static Void_t* dthash(Dt_t* dt, reg Void_t* obj, int type)
|
|
#else
|
|
static Void_t* dthash(dt,obj,type)
|
|
Index: lib/cdt/dtlist.c
|
|
===================================================================
|
|
--- lib/cdt/dtlist.c.orig 2013-08-01 19:35:15.000000000 +0200
|
|
+++ lib/cdt/dtlist.c 2013-09-03 12:11:48.959466853 +0200
|
|
@@ -5,7 +5,7 @@
|
|
** Written by Kiem-Phong Vo (05/25/96)
|
|
*/
|
|
|
|
-#if __STD_C
|
|
+#if __STDC__
|
|
static Void_t* dtlist(reg Dt_t* dt, reg Void_t* obj, reg int type)
|
|
#else
|
|
static Void_t* dtlist(dt, obj, type)
|
|
Index: lib/cdt/dtmethod.c
|
|
===================================================================
|
|
--- lib/cdt/dtmethod.c.orig 2013-08-01 19:35:15.000000000 +0200
|
|
+++ lib/cdt/dtmethod.c 2013-09-03 12:13:14.998401326 +0200
|
|
@@ -5,7 +5,7 @@
|
|
** Written by Kiem-Phong Vo (05/25/96)
|
|
*/
|
|
|
|
-#if __STD_C
|
|
+#if __STDC__
|
|
Dtmethod_t* dtmethod(Dt_t* dt, Dtmethod_t* meth)
|
|
#else
|
|
Dtmethod_t* dtmethod(dt, meth)
|
|
Index: lib/cdt/dtopen.c
|
|
===================================================================
|
|
--- lib/cdt/dtopen.c.orig 2013-08-01 19:35:15.000000000 +0200
|
|
+++ lib/cdt/dtopen.c 2013-09-03 12:13:17.886332023 +0200
|
|
@@ -6,7 +6,7 @@ static char* Version = "\n@(#)$Id$\0
|
|
** Written by Kiem-Phong Vo (5/25/96)
|
|
*/
|
|
|
|
-#if __STD_C
|
|
+#if __STDC__
|
|
Dt_t* dtopen(Dtdisc_t* disc, Dtmethod_t* meth)
|
|
#else
|
|
Dt_t* dtopen(disc, meth)
|
|
Index: lib/cdt/dtrenew.c
|
|
===================================================================
|
|
--- lib/cdt/dtrenew.c.orig 2013-08-01 19:35:15.000000000 +0200
|
|
+++ lib/cdt/dtrenew.c 2013-09-03 12:13:23.117206500 +0200
|
|
@@ -6,7 +6,7 @@
|
|
** Written by Kiem-Phong Vo (5/25/96)
|
|
*/
|
|
|
|
-#if __STD_C
|
|
+#if __STDC__
|
|
Void_t* dtrenew(Dt_t* dt, reg Void_t* obj)
|
|
#else
|
|
Void_t* dtrenew(dt, obj)
|
|
Index: lib/cdt/dtrestore.c
|
|
===================================================================
|
|
--- lib/cdt/dtrestore.c.orig 2013-08-01 19:35:15.000000000 +0200
|
|
+++ lib/cdt/dtrestore.c 2013-09-03 12:13:25.885140082 +0200
|
|
@@ -7,7 +7,7 @@
|
|
** Written by Kiem-Phong Vo (5/25/96)
|
|
*/
|
|
|
|
-#if __STD_C
|
|
+#if __STDC__
|
|
int dtrestore(reg Dt_t* dt, reg Dtlink_t* list)
|
|
#else
|
|
int dtrestore(dt, list)
|
|
Index: lib/cdt/dtsize.c
|
|
===================================================================
|
|
--- lib/cdt/dtsize.c.orig 2013-08-01 19:35:15.000000000 +0200
|
|
+++ lib/cdt/dtsize.c 2013-09-03 12:11:57.558260351 +0200
|
|
@@ -5,7 +5,7 @@
|
|
** Written by Kiem-Phong Vo (5/25/96)
|
|
*/
|
|
|
|
-#if __STD_C
|
|
+#if __STDC__
|
|
static int treecount(reg Dtlink_t* e)
|
|
#else
|
|
static int treecount(e)
|
|
@@ -14,7 +14,7 @@ reg Dtlink_t* e;
|
|
{ return e ? treecount(e->left) + treecount(e->right) + 1 : 0;
|
|
}
|
|
|
|
-#if __STD_C
|
|
+#if __STDC__
|
|
int dtsize(Dt_t* dt)
|
|
#else
|
|
int dtsize(dt)
|
|
Index: lib/cdt/dtstat.c
|
|
===================================================================
|
|
--- lib/cdt/dtstat.c.orig 2013-08-01 19:35:15.000000000 +0200
|
|
+++ lib/cdt/dtstat.c 2013-09-03 12:11:54.262339501 +0200
|
|
@@ -5,7 +5,7 @@
|
|
** Written by Kiem-Phong Vo (5/25/96)
|
|
*/
|
|
|
|
-#if __STD_C
|
|
+#if __STDC__
|
|
static void dttstat(Dtstat_t* ds, Dtlink_t* root, int depth, int* level)
|
|
#else
|
|
static void dttstat(ds,root,depth,level)
|
|
@@ -25,7 +25,7 @@ int* level;
|
|
level[depth] += 1;
|
|
}
|
|
|
|
-#if __STD_C
|
|
+#if __STDC__
|
|
static void dthstat(reg Dtdata_t* data, Dtstat_t* ds, reg int* count)
|
|
#else
|
|
static void dthstat(data, ds, count)
|
|
@@ -51,7 +51,7 @@ reg int* count;
|
|
}
|
|
}
|
|
|
|
-#if __STD_C
|
|
+#if __STDC__
|
|
int dtstat(reg Dt_t* dt, Dtstat_t* ds, int all)
|
|
#else
|
|
int dtstat(dt, ds, all)
|
|
Index: lib/cdt/dtstrhash.c
|
|
===================================================================
|
|
--- lib/cdt/dtstrhash.c.orig 2013-08-01 19:35:15.000000000 +0200
|
|
+++ lib/cdt/dtstrhash.c 2013-09-03 12:13:28.373080384 +0200
|
|
@@ -13,7 +13,7 @@
|
|
** Written by Kiem-Phong Vo (02/28/03)
|
|
*/
|
|
|
|
-#if __STD_C
|
|
+#if __STDC__
|
|
uint dtstrhash(reg uint h, Void_t* args, reg int n)
|
|
#else
|
|
uint dtstrhash(h,args,n)
|
|
Index: lib/cdt/dttree.c
|
|
===================================================================
|
|
--- lib/cdt/dttree.c.orig 2013-08-01 19:35:15.000000000 +0200
|
|
+++ lib/cdt/dttree.c 2013-09-03 12:13:31.517004947 +0200
|
|
@@ -8,7 +8,7 @@
|
|
** Written by Kiem-Phong Vo (5/25/96)
|
|
*/
|
|
|
|
-#if __STD_C
|
|
+#if __STDC__
|
|
static Void_t* dttree(Dt_t* dt, Void_t* obj, int type)
|
|
#else
|
|
static Void_t* dttree(dt,obj,type)
|
|
Index: lib/cdt/dttreeset.c
|
|
===================================================================
|
|
--- lib/cdt/dttreeset.c.orig 2013-08-01 19:35:15.000000000 +0200
|
|
+++ lib/cdt/dttreeset.c 2013-09-03 12:13:36.956874425 +0200
|
|
@@ -5,7 +5,7 @@
|
|
** Written by Kiem-Phong Vo (09/17/2001)
|
|
*/
|
|
|
|
-#if __STD_C
|
|
+#if __STDC__
|
|
static Dtlink_t* treebalance(Dtlink_t* list, int size)
|
|
#else
|
|
static Dtlink_t* treebalance(list, size)
|
|
@@ -28,7 +28,7 @@ int size;
|
|
return mid;
|
|
}
|
|
|
|
-#if __STD_C
|
|
+#if __STDC__
|
|
int dttreeset(Dt_t* dt, int minp, int balance)
|
|
#else
|
|
int dttreeset(dt, minp, balance)
|
|
Index: lib/cdt/dtview.c
|
|
===================================================================
|
|
--- lib/cdt/dtview.c.orig 2013-08-01 19:35:15.000000000 +0200
|
|
+++ lib/cdt/dtview.c 2013-09-03 12:13:40.132798226 +0200
|
|
@@ -6,7 +6,7 @@
|
|
*/
|
|
|
|
|
|
-#if __STD_C
|
|
+#if __STDC__
|
|
static Void_t* dtvsearch(Dt_t* dt, reg Void_t* obj, reg int type)
|
|
#else
|
|
static Void_t* dtvsearch(dt,obj,type)
|
|
@@ -93,7 +93,7 @@ reg int type;
|
|
}
|
|
}
|
|
|
|
-#if __STD_C
|
|
+#if __STDC__
|
|
Dt_t* dtview(reg Dt_t* dt, reg Dt_t* view)
|
|
#else
|
|
Dt_t* dtview(dt,view)
|
|
Index: lib/cdt/dtwalk.c
|
|
===================================================================
|
|
--- lib/cdt/dtwalk.c.orig 2013-08-01 19:35:15.000000000 +0200
|
|
+++ lib/cdt/dtwalk.c 2013-09-03 12:13:42.964730282 +0200
|
|
@@ -6,7 +6,7 @@
|
|
** Written by Kiem-Phong Vo (5/25/96)
|
|
*/
|
|
|
|
-#if __STD_C
|
|
+#if __STDC__
|
|
int dtwalk(reg Dt_t* dt, int (*userf)(Dt_t*, Void_t*, Void_t*), Void_t* data)
|
|
#else
|
|
int dtwalk(dt,userf,data)
|