From 92d2e9d79831a165598ee46d72bb1f887a023909 Mon Sep 17 00:00:00 2001
From: Douglas Guptill <douglas.guptill@dal.ca>
Date: Sun, 31 May 2009 15:05:14 +0000
Subject: [PATCH] fixups
---
NN/stack.c | 6 ++---
NN/stackpair.c | 6 ++---
NN/volume.c | 60 +++++++++++++++++++++++++++++++++++++-------------
3 files changed, 51 insertions(+), 21 deletions(-)
diff --git a/NN/stack.c b/NN/stack.c
index 4f8f56b0..a1120338 100644
--- a/NN/stack.c
+++ b/NN/stack.c
@@ -10,7 +10,7 @@
z->next = z;
z->key = 0;
}
- push (p) {push_(p);}
+ push (p) int *p; {push_(p);}
push_(p)
int *p;
{
@@ -20,7 +20,7 @@
t->key = v; t->next = head->next;
head->next =t;
}
- pop (x) {pop_(x);}
+ pop (x) int *x; {pop_(x);}
pop_(x)
int *x;
{
@@ -28,7 +28,7 @@
*x = t->key;
free(t);
}
- stackempty (i) {stackempty_(i);}
+ stackempty (i) int *i; {stackempty_(i);}
stackempty_(i)
int *i;
{
diff --git a/NN/stackpair.c b/NN/stackpair.c
index 6d8c6ba4..a4da6bfb 100644
--- a/NN/stackpair.c
+++ b/NN/stackpair.c
@@ -25,7 +25,7 @@
free(za);
free(zb);
}
- pushpair_(pa, pb) {pushpair(pa, pb);}
+ pushpair_(pa, pb) int *pa; int *pb; {pushpair(pa, pb);}
pushpair (pa, pb)
int *pa;
int *pb;
@@ -42,7 +42,7 @@
tb->key = vb; tb->next = headb->next;
headb->next =tb;
}
- poppair_(xa,xb) {poppair(xa,xb);}
+ poppair_(xa,xb) int *xa; int *xb; {poppair(xa,xb);}
poppair (xa,xb)
int *xa;
int *xb;
@@ -54,7 +54,7 @@
*xb = tb->key;
free(tb);
}
- stackpairempty_(i) {stackpairempty(i);}
+ stackpairempty_(i) int *i; {stackpairempty(i);}
stackpairempty (i)
int *i;
{
diff --git a/NN/volume.c b/NN/volume.c
index e4986cfa..cc8f0f94 100644
--- a/NN/volume.c
+++ b/NN/volume.c
@@ -216,18 +216,20 @@ return(v);
----------------------------------------------------------------*/
-volume_(a,b,m,n,mmax,nmax,result) {
- volume (a,b,m,n,mmax,nmax,result);}
-volume (a,b,m,n,mmax,nmax,result)
-
-int *n, *m, *mmax, *nmax;
-float *a, *b;
-float *result;
-
+volume_(a,b,m,n,mmax,nmax,result)
+ int *n, *m, *mmax, *nmax;
+ float *a, *b;
+ float *result;
{
+ volume (a,b,m,n,mmax,nmax,result);
+}
-*result=cvolume(a,b,m,n,mmax,nmax);
-
+volume (a,b,m,n,mmax,nmax,result)
+ int *n, *m, *mmax, *nmax;
+ float *a, *b;
+ float *result;
+{
+ *result=cvolume(a,b,m,n,mmax,nmax);
}
/*--------------------------------------------------------------
@@ -431,9 +433,15 @@ return(v);
----------------------------------------------------------------*/
-volumeb_ (a,b,m,n,mmax,nmax,opt,volume,dvdb) {
+volumeb_ (a,b,m,n,mmax,nmax,opt,volume,dvdb)
+ int *n, *m, *mmax, *nmax, *opt;
+ float *a, *b;
+ float *volume;
+ float *dvdb;
+{
volumeb(a,b,m,n,mmax,nmax,opt,volume,dvdb);
}
+
volumeb (a,b,m,n,mmax,nmax,opt,volume,dvdb)
int *n, *m, *mmax, *nmax, *opt;
@@ -660,9 +668,15 @@ return(v);
A dummy routine used to call cvolumebj from a fortran routine
----------------------------------------------------------------*/
-volumebj_ (a,b,m,n,mmax,nmax,con,volume,dvdb) {
+volumebj_ (a,b,m,n,mmax,nmax,con,volume,dvdb)
+ int *n, *m, *mmax, *nmax,*con;
+ float *a, *b;
+ float *volume;
+ float *dvdb;
+{
volumebj(a,b,m,n,mmax,nmax,con,volume,dvdb);
}
+
volumebj (a,b,m,n,mmax,nmax,con,volume,dvdb)
int *n, *m, *mmax, *nmax,*con;
@@ -1033,9 +1047,14 @@ return(v);
----------------------------------------------------------------*/
/* Not used...won't compile...function name and variable name identical */
/*
-dvda_ (a,b,m,n,mmax,nmax,idim,dvda,code) {
+dvda_ (a,b,m,n,mmax,nmax,idim,dvda,code)
+int *n, *m, *mmax, *nmax, *idim, *code;
+float *a, *b;
+float *dvda;
+{
dvda(a,b,m,n,mmax,nmax,idim,dvda,code);
}
+
dvda (a,b,m,n,mmax,nmax,idim,dvda,code)
int *n, *m, *mmax, *nmax, *idim, *code;
@@ -1056,6 +1075,7 @@ tdim = *idim - 1;
free(temp);
}
*/
+
/*--------------------------------------------------------------
ROUTINE: cvolumef
@@ -1230,9 +1250,14 @@ return(v);
----------------------------------------------------------------*/
-volumef_ (a,b,m,n,mmax,nmax,volume) {
+volumef_ (a,b,m,n,mmax,nmax,volume)
+ int *n, *m, *mmax, *nmax;
+ float *a, *b;
+ float *volume;
+{
volumef(a,b,m,n,mmax,nmax,volume);
}
+
volumef (a,b,m,n,mmax,nmax,volume)
int *n, *m, *mmax, *nmax;
@@ -1604,9 +1629,14 @@ return(v);
----------------------------------------------------------------*/
-dvdaf_ (a,b,m,n,mmax,nmax,idim,dvda,code) {
+dvdaf_ (a,b,m,n,mmax,nmax,idim,dvda,code)
+ int *n, *m, *mmax, *nmax, *idim, *code;
+ float *a, *b;
+ float *dvda;
+{
dvdaf(a,b,m,n,mmax,nmax,idim,dvda,code);
}
+
dvdaf (a,b,m,n,mmax,nmax,idim,dvda,code)
int *n, *m, *mmax, *nmax, *idim, *code;
--
GitLab