From c54bda7dc0e3885e47dc1157f3b16f65e7497c22 Mon Sep 17 00:00:00 2001
From: pnenzi <pnenzi>
Date: Fri, 26 Dec 2003 11:03:24 +0000
Subject: [PATCH] Removed #if INTERPOLATE

---
 src/frontend/evaluate.c   | 5 -----
 src/frontend/parse.c      | 7 ++-----
 src/maths/cmaths/cmath4.c | 8 +-------
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/frontend/evaluate.c b/src/frontend/evaluate.c
index d89528c62..cf9cf0d10 100644
--- a/src/frontend/evaluate.c
+++ b/src/frontend/evaluate.c
@@ -707,8 +707,6 @@ apply_func(struct func *func, struct pnode *arg)
         }
         (void) signal(SIGILL, (SIGNAL_FUNCTION) sig_matherr);
 
-#define INTERPOLATE 1 /* va, enable interpolate */
-#if INTERPOLATE
 	/* FIXME: The call to (*func->fu_func) has too many arguments;
            hence the compiler quits.  How to circumvent this (without
            losing function prototypes)?  For now, these functions have
@@ -722,16 +720,13 @@ apply_func(struct func *func, struct pnode *arg)
 		          v->v_length, &len, &type,
 		          v->v_plot, plot_cur, v->v_dims[0]));
         } else {
-#endif
             data = ((*func->fu_func) ((isreal(v) ? (void *)
 				       v->v_realdata :
 				       (void *) v->v_compdata),
 				      (short) (isreal(v) ? VF_REAL :
 					       VF_COMPLEX),
 				      v->v_length, &len, &type));
-#if INTERPOLATE
 	}
-#endif
         /* Back to normal */
         (void) signal(SIGILL, SIG_DFL);
 
diff --git a/src/frontend/parse.c b/src/frontend/parse.c
index 18e2c793b..f2bcccf98 100644
--- a/src/frontend/parse.c
+++ b/src/frontend/parse.c
@@ -700,15 +700,12 @@ struct func ft_funcs[] = {
         { "vecmin", cx_min } ,
         { "vecmax", cx_max } ,
         { "vecd", cx_d } ,
-#define INTERPOLATE 1 /* va, enable interpolate */
-#if INTERPOLATE
 	/* va, deactivate function prototype testing for this 2 functions, only. Gives a warning. */
 #define INTERPOL_FUNC (void *(*)())
 	/* These functions have been temporarily been disabled.  See
            their definitions for the reason. */
-        { "interpolate",INTERPOL_FUNC cx_interpolate } ,
-        { "deriv",      INTERPOL_FUNC cx_deriv } ,
-#endif
+        { "interpolate", INTERPOL_FUNC  cx_interpolate } ,
+        { "deriv",       INTERPOL_FUNC  cx_deriv } ,
         { "v",      NULL } ,
         { NULL,     NULL }
 } ;
diff --git a/src/maths/cmaths/cmath4.c b/src/maths/cmaths/cmath4.c
index 52a10fac0..c9501f887 100644
--- a/src/maths/cmaths/cmath4.c
+++ b/src/maths/cmaths/cmath4.c
@@ -130,12 +130,7 @@ cx_not(void *data, short int type, int length, int *newlength, short int *newtyp
     return ((void *) d);
 }
 
-#define INTERPOLATE 1 /* va, enable interpolate */
-#if INTERPOLATE
-/* These functions have been temporarily disabled.  They contain code
-   only found in the frontend and their prototype does not conform to
-   the prototypes found for other complex functions.  They will not be
-   re-enabled until these issues have been resolved. */
+
 
 /* This is a strange function. What we do is fit a polynomial to the
  * curve, of degree $polydegree, and then evaluate it at the points
@@ -371,4 +366,3 @@ cx_deriv(void *data, short int type, int length, int *newlength, short int *newt
     }
 
 }
-#endif