aboutsummaryrefslogtreecommitdiff
path: root/src/graph/view3D/msort3d.c
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2008-04-05 21:06:47 +0000
committerdos-reis <gdr@axiomatics.org>2008-04-05 21:06:47 +0000
commit73bb103e111fb12bed013b2b3728d592c1a11587 (patch)
tree1a538a0253a133db5bed07f8dc85f6c5ad05b568 /src/graph/view3D/msort3d.c
parentf165b636e6f5041cade0955284503864b07b9f63 (diff)
downloadopen-axiom-73bb103e111fb12bed013b2b3728d592c1a11587.tar.gz
Remove remaining K&R style prototypes.
Diffstat (limited to 'src/graph/view3D/msort3d.c')
-rw-r--r--src/graph/view3D/msort3d.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/src/graph/view3D/msort3d.c b/src/graph/view3D/msort3d.c
index 36e07743..792196a8 100644
--- a/src/graph/view3D/msort3d.c
+++ b/src/graph/view3D/msort3d.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+ Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
All rights reserved.
Copyright (C) 2007-2008, Gabriel Dos Reis.
All rights reserved.
@@ -16,7 +16,7 @@
the documentation and/or other materials provided with the
distribution.
- - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+ - Neither the name of The Numerical Algorithms Group Ltd. nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
@@ -95,13 +95,7 @@
**********************/
linkThing *
-#ifdef _NO_PROTO
-merge(p,q,compare)
- linkThing *p,*q;
- int (*compare)();
-#else
merge(linkThing *p, linkThing *q,int (*compare)(linkThing *, linkThing *))
-#endif
{
linkThing *returnVal,*current,*pN,*qN;
@@ -147,14 +141,7 @@ merge(linkThing *p, linkThing *q,int (*compare)(linkThing *, linkThing *))
*********************************/
linkThing *
-#ifdef _NO_PROTO
-msort(p,min,max,compare)
- linkThing *p;
- int min,max;
- int (*compare)();
-#else
msort(linkThing *p,int min,int max,int (*compare)(linkThing *, linkThing *))
-#endif
{
int mid;
int i;