diff options
author | wiz <wiz@pkgsrc.org> | 2004-09-08 16:10:08 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2004-09-08 16:10:08 +0000 |
commit | c801ee5bf2f6a1ea586eae4ef195f7812bec513b (patch) | |
tree | b8eef168d8e6d0a635d95580961e587048cc91f4 /geography/vis5d+ | |
parent | 5ba21d2afe79cac7d15d93d96002ff922804e41d (diff) | |
download | pkgsrc-c801ee5bf2f6a1ea586eae4ef195f7812bec513b.tar.gz |
Rename round() to roundnice() to avoid conflict with math.h round().
Should fix bulk build.
Diffstat (limited to 'geography/vis5d+')
-rw-r--r-- | geography/vis5d+/distinfo | 5 | ||||
-rw-r--r-- | geography/vis5d+/patches/patch-aa | 31 | ||||
-rw-r--r-- | geography/vis5d+/patches/patch-ab | 13 | ||||
-rw-r--r-- | geography/vis5d+/patches/patch-ac | 13 |
4 files changed, 61 insertions, 1 deletions
diff --git a/geography/vis5d+/distinfo b/geography/vis5d+/distinfo index 90597c35d0f..f9ef7c03dac 100644 --- a/geography/vis5d+/distinfo +++ b/geography/vis5d+/distinfo @@ -1,4 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2003/10/05 16:43:08 jschauma Exp $ +$NetBSD: distinfo,v 1.2 2004/09/08 16:10:08 wiz Exp $ SHA1 (vis5d+-1.2.1.tar.gz) = d99ec14fd8e6e482ab360abbd00adf36e7fd541b Size (vis5d+-1.2.1.tar.gz) = 2278840 bytes +SHA1 (patch-aa) = 114ed11fbf8368554d1f57562a3423010cd155ba +SHA1 (patch-ab) = 923d373d343ede9ec621e6514ff3ad6dcbce777b +SHA1 (patch-ac) = 1389db298fe78372b048899a72f87bb7ffcf4e58 diff --git a/geography/vis5d+/patches/patch-aa b/geography/vis5d+/patches/patch-aa new file mode 100644 index 00000000000..4925f32df36 --- /dev/null +++ b/geography/vis5d+/patches/patch-aa @@ -0,0 +1,31 @@ +$NetBSD: patch-aa,v 1.1 2004/09/08 16:10:08 wiz Exp $ + +--- src/misc.c.orig 2001-11-07 12:53:12.000000000 +0100 ++++ src/misc.c +@@ -147,7 +147,7 @@ int installed( char *program ) + /*** round ************************************************************ + Round off x to a 'nice' value. + **********************************************************************/ +-float round( float x ) ++float roundnice( float x ) + { + float base, fudge; + int temp; +@@ -273,7 +273,7 @@ void init_graphics_pos( Context ctx, int + ctx->Variable[var]->HSliceRequest->Interval = 0.0; + } + else { +- ctx->Variable[var]->HSliceRequest->Interval = round( (ctx->Variable[var]->MaxVal - ctx->Variable[var]->MinVal) ++ ctx->Variable[var]->HSliceRequest->Interval = roundnice( (ctx->Variable[var]->MaxVal - ctx->Variable[var]->MinVal) + / 10.0 ); + } + +@@ -309,7 +309,7 @@ void init_graphics_pos( Context ctx, int + ctx->Variable[var]->VSliceRequest->Interval = 0.0; + } + else { +- ctx->Variable[var]->VSliceRequest->Interval = round( (ctx->Variable[var]->MaxVal - ctx->Variable[var]->MinVal) ++ ctx->Variable[var]->VSliceRequest->Interval = roundnice( (ctx->Variable[var]->MaxVal - ctx->Variable[var]->MinVal) + / 10.0 ); + } + diff --git a/geography/vis5d+/patches/patch-ab b/geography/vis5d+/patches/patch-ab new file mode 100644 index 00000000000..3bc951dc978 --- /dev/null +++ b/geography/vis5d+/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2004/09/08 16:10:08 wiz Exp $ + +--- src/misc.h.orig 2001-11-07 12:53:12.000000000 +0100 ++++ src/misc.h +@@ -37,7 +37,7 @@ + + extern void die( char *msg ); + +-extern float round( float x ); ++extern float roundnice( float x ); + + extern int which( char *file, char *fullpath ); + diff --git a/geography/vis5d+/patches/patch-ac b/geography/vis5d+/patches/patch-ac new file mode 100644 index 00000000000..86f8a707b48 --- /dev/null +++ b/geography/vis5d+/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 2004/09/08 16:10:08 wiz Exp $ + +--- src/work.c.orig 2001-11-07 12:53:30.000000000 +0100 ++++ src/work.c +@@ -6791,7 +6791,7 @@ void set_hslice_pos(Context ctx, int var + request->HighLimit = floor(request->HighLimit*factor)/(float) factor; + } + } +- request->Interval = round((request->HighLimit - request->LowLimit)/5.0); ++ request->Interval = roundnice((request->HighLimit - request->LowLimit)/5.0); + + } + } |