gsl 1.15.3 → 1.16.0.6

data/ext/{sf.c → gsl_native/sf.c}

@@ -10,11 +10,8 @@
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 */
 
-#include "rb_gsl_array.h"
-#include "rb_gsl_sf.h"
-#ifdef HAVE_NARRAY_H
-#include "narray.h"
-#endif
+#include "include/rb_gsl_array.h"
+#include "include/rb_gsl_sf.h"
 
 VALUE cgsl_sf_result, cgsl_sf_result_e10;
 
@@ -154,10 +151,6 @@ VALUE rb_gsl_sf_eval_int_double(double (*func)(int, double), VALUE jj, VALUE arg
   VALUE ary, xx;
   size_t i, j, k, n;
   double val;
-#ifdef HAVE_NARRAY_H
-  double *ptr1, *ptr2;
-  struct NARRAY *na;
-#endif
   CHECK_FIXNUM(jj);
   j = FIX2INT(jj);
   if (CLASS_OF(argv) == rb_cRange) argv = rb_gsl_range2ary(argv);
@@ -181,6 +174,8 @@ VALUE rb_gsl_sf_eval_int_double(double (*func)(int, double), VALUE jj, VALUE arg
   default:
 #ifdef HAVE_NARRAY_H
     if (NA_IsNArray(argv)) {
+      double *ptr1, *ptr2;
+      struct NARRAY *na;
       argv = na_change_type(argv, NA_DFLOAT);
       ptr1 = NA_PTR_TYPE(argv, double*);
       GetNArray(argv, na);
@@ -195,10 +190,10 @@ VALUE rb_gsl_sf_eval_int_double(double (*func)(int, double), VALUE jj, VALUE arg
       Data_Get_Struct(argv, gsl_matrix, m);
       mnew = gsl_matrix_alloc(m->size1, m->size2);
       for (i = 0; i < m->size1; i++) {
-	for (k = 0; k < m->size2; k++) {
-	  val = (*func)(j, gsl_matrix_get(m, i, k));
-	  gsl_matrix_set(mnew, i, k, val);
-	}
+        for (k = 0; k < m->size2; k++) {
+          val = (*func)(j, gsl_matrix_get(m, i, k));
+          gsl_matrix_set(mnew, i, k, val);
+        }
       }
       return Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, mnew);
     } else {
@@ -207,8 +202,8 @@ VALUE rb_gsl_sf_eval_int_double(double (*func)(int, double), VALUE jj, VALUE arg
       n = v->size;
       vnew = gsl_vector_alloc(n);
       for (i = 0; i < n; i++) {
-	val = (*func)(j, gsl_vector_get(v, i));
-	gsl_vector_set(vnew, i, val);
+        val = (*func)(j, gsl_vector_get(v, i));
+        gsl_vector_set(vnew, i, val);
       }
       return Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, vnew);
     }
@@ -223,10 +218,6 @@ VALUE rb_gsl_sf_eval_double_int(double (*func)(double, int), VALUE argv, VALUE j
   VALUE ary, xx;
   size_t i, j, k, n;
   double val;
-#ifdef HAVE_NARRAY_H
-  double *ptr1, *ptr2;
-  struct NARRAY *na;
-#endif
   CHECK_FIXNUM(jj);
   j = FIX2INT(jj);
   if (CLASS_OF(argv) == rb_cRange) argv = rb_gsl_range2ary(argv);
@@ -250,6 +241,8 @@ VALUE rb_gsl_sf_eval_double_int(double (*func)(double, int), VALUE argv, VALUE j
   default:
 #ifdef HAVE_NARRAY_H
     if (NA_IsNArray(argv)) {
+      double *ptr1, *ptr2;
+      struct NARRAY *na;
       argv = na_change_type(argv, NA_DFLOAT);
       ptr1 = NA_PTR_TYPE(argv, double*);
       GetNArray(argv, na);
@@ -264,10 +257,10 @@ VALUE rb_gsl_sf_eval_double_int(double (*func)(double, int), VALUE argv, VALUE j
       Data_Get_Struct(argv, gsl_matrix, m);
       mnew = gsl_matrix_alloc(m->size1, m->size2);
       for (i = 0; i < m->size1; i++) {
-	for (k = 0; k < m->size2; k++) {
-	  val = (*func)(gsl_matrix_get(m, i, k), j);
-	  gsl_matrix_set(mnew, i, k, val);
-	}
+        for (k = 0; k < m->size2; k++) {
+          val = (*func)(gsl_matrix_get(m, i, k), j);
+          gsl_matrix_set(mnew, i, k, val);
+        }
       }
       return Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, mnew);
     } else {
@@ -276,8 +269,8 @@ VALUE rb_gsl_sf_eval_double_int(double (*func)(double, int), VALUE argv, VALUE j
       n = v->size;
       vnew = gsl_vector_alloc(n);
       for (i = 0; i < n; i++) {
-	val = (*func)(gsl_vector_get(v, i), j);
-	gsl_vector_set(vnew, i, val);
+        val = (*func)(gsl_vector_get(v, i), j);
+        gsl_vector_set(vnew, i, val);
       }
       return Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, vnew);
     }
@@ -287,17 +280,13 @@ VALUE rb_gsl_sf_eval_double_int(double (*func)(double, int), VALUE argv, VALUE j
 }
 
 VALUE rb_gsl_sf_eval_int_int_double(double (*func)(int, int, double), VALUE jj,
-				    VALUE jj2, VALUE argv)
+                                    VALUE jj2, VALUE argv)
 {
   gsl_vector *v = NULL, *vnew = NULL;
   gsl_matrix *m = NULL, *mnew = NULL;
   VALUE ary, xx;
   size_t i, j, k, j2, n;
   double val;
-#ifdef HAVE_NARRAY_H
-  double *ptr1, *ptr2;
-  struct NARRAY *na;
-#endif
   CHECK_FIXNUM(jj); CHECK_FIXNUM(jj2);
   j = FIX2INT(jj);
   j2 = FIX2INT(jj2);
@@ -322,6 +311,8 @@ VALUE rb_gsl_sf_eval_int_int_double(double (*func)(int, int, double), VALUE jj,
   default:
 #ifdef HAVE_NARRAY_H
     if (NA_IsNArray(argv)) {
+      double *ptr1, *ptr2;
+      struct NARRAY *na;
       argv = na_change_type(argv, NA_DFLOAT);
       ptr1 = NA_PTR_TYPE(argv, double*);
       GetNArray(argv, na);
@@ -357,18 +348,14 @@ VALUE rb_gsl_sf_eval_int_int_double(double (*func)(int, int, double), VALUE jj,
   }
 }
 
-VALUE rb_gsl_sf_eval_int_double_double(double (*func)(int, double, double), VALUE jj, 
-				       VALUE ff, VALUE argv)
+VALUE rb_gsl_sf_eval_int_double_double(double (*func)(int, double, double), VALUE jj,
+                                       VALUE ff, VALUE argv)
 {
   gsl_vector *v = NULL, *vnew = NULL;
   gsl_matrix *m = NULL, *mnew = NULL;
   VALUE ary, xx;
   size_t i, j, k, n;
   double f, val;
-#ifdef HAVE_NARRAY_H
-  double *ptr1, *ptr2;
-  struct NARRAY *na;
-#endif
   CHECK_FIXNUM(jj);
   Need_Float(ff);
   j = FIX2INT(jj);
@@ -394,6 +381,8 @@ VALUE rb_gsl_sf_eval_int_double_double(double (*func)(int, double, double), VALU
   default:
 #ifdef HAVE_NARRAY_H
     if (NA_IsNArray(argv)) {
+      double *ptr1, *ptr2;
+      struct NARRAY *na;
       argv = na_change_type(argv, NA_DFLOAT);
       ptr1 = NA_PTR_TYPE(argv, double*);
       GetNArray(argv, na);
@@ -408,10 +397,10 @@ VALUE rb_gsl_sf_eval_int_double_double(double (*func)(int, double, double), VALU
       Data_Get_Struct(argv, gsl_matrix, m);
       mnew = gsl_matrix_alloc(m->size1, m->size2);
       for (i = 0; i < m->size1; i++) {
-	for (k = 0; k < m->size2; k++) {
-	  val = (*func)(j, f, gsl_matrix_get(m, i, k));
-	  gsl_matrix_set(mnew, i, k, val);
-	}
+        for (k = 0; k < m->size2; k++) {
+          val = (*func)(j, f, gsl_matrix_get(m, i, k));
+          gsl_matrix_set(mnew, i, k, val);
+        }
       }
       return Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, mnew);
     } else {
@@ -420,8 +409,8 @@ VALUE rb_gsl_sf_eval_int_double_double(double (*func)(int, double, double), VALU
       n = v->size;
       vnew = gsl_vector_alloc(n);
       for (i = 0; i < n; i++) {
-	val = (*func)(j, f, gsl_vector_get(v, i));
-	gsl_vector_set(vnew, i, val);
+        val = (*func)(j, f, gsl_vector_get(v, i));
+        gsl_vector_set(vnew, i, val);
       }
       return Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, vnew);
     }
@@ -436,10 +425,6 @@ VALUE rb_gsl_sf_eval_double_double(double (*func)(double, double), VALUE ff, VAL
   VALUE ary, xx;
   size_t i, k, n;
   double val, f;
-#ifdef HAVE_NARRAY_H
-  double *ptr1, *ptr2;
-  struct NARRAY *na;
-#endif
   Need_Float(ff);
   f = NUM2DBL(ff);
   if (CLASS_OF(argv) == rb_cRange) argv = rb_gsl_range2ary(argv);
@@ -463,6 +448,8 @@ VALUE rb_gsl_sf_eval_double_double(double (*func)(double, double), VALUE ff, VAL
   default:
 #ifdef HAVE_NARRAY_H
     if (NA_IsNArray(argv)) {
+      double *ptr1, *ptr2;
+      struct NARRAY *na;
       argv = na_change_type(argv, NA_DFLOAT);
       ptr1 = NA_PTR_TYPE(argv, double*);
       GetNArray(argv, na);
@@ -477,9 +464,9 @@ VALUE rb_gsl_sf_eval_double_double(double (*func)(double, double), VALUE ff, VAL
       Data_Get_Struct(argv, gsl_matrix, m);
       mnew = gsl_matrix_alloc(m->size1, m->size2);
       for (i = 0; i < m->size1; i++) {
-	for (k = 0; k < m->size2; k++) {
-	  gsl_matrix_set(mnew, i, k, (*func)(f, gsl_matrix_get(m, i, k)));
-	}
+        for (k = 0; k < m->size2; k++) {
+          gsl_matrix_set(mnew, i, k, (*func)(f, gsl_matrix_get(m, i, k)));
+        }
       }
       return Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, mnew);
     } else {
@@ -487,7 +474,7 @@ VALUE rb_gsl_sf_eval_double_double(double (*func)(double, double), VALUE ff, VAL
       Data_Get_Struct(argv, gsl_vector, v);
       vnew = gsl_vector_alloc(v->size);
       for (i = 0; i < v->size; i++) {
-	gsl_vector_set(vnew, i, (*func)(f, gsl_vector_get(v, i)));
+        gsl_vector_set(vnew, i, (*func)(f, gsl_vector_get(v, i)));
       }
       return Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, vnew);
     }
@@ -495,18 +482,14 @@ VALUE rb_gsl_sf_eval_double_double(double (*func)(double, double), VALUE ff, VAL
   }
 }
 
-VALUE rb_gsl_sf_eval_double3(double (*func)(double, double, double), 
-			     VALUE ff, VALUE ff2, VALUE argv)
+VALUE rb_gsl_sf_eval_double3(double (*func)(double, double, double),
+                             VALUE ff, VALUE ff2, VALUE argv)
 {
   gsl_vector *v = NULL, *vnew = NULL;
   gsl_matrix *m = NULL, *mnew = NULL;
   VALUE ary, xx;
   size_t i, k, n;
   double val, f, f2;
-#ifdef HAVE_NARRAY_H
-  double *ptr1, *ptr2;
-  struct NARRAY *na;
-#endif
   Need_Float(ff); Need_Float(ff2);
   f = NUM2DBL(ff);
   f2 = NUM2DBL(ff2);
@@ -531,6 +514,8 @@ VALUE rb_gsl_sf_eval_double3(double (*func)(double, double, double),
   default:
 #ifdef HAVE_NARRAY_H
     if (NA_IsNArray(argv)) {
+      double *ptr1, *ptr2;
+      struct NARRAY *na;
       argv = na_change_type(argv, NA_DFLOAT);
       ptr1 = NA_PTR_TYPE(argv, double*);
       GetNArray(argv, na);
@@ -545,10 +530,10 @@ VALUE rb_gsl_sf_eval_double3(double (*func)(double, double, double),
       Data_Get_Struct(argv, gsl_matrix, m);
       mnew = gsl_matrix_alloc(m->size1, m->size2);
       for (i = 0; i < m->size1; i++) {
-	for (k = 0; k < m->size2; k++) {
-	  val = (*func)(f, f2, gsl_matrix_get(m, i, k));
-	  gsl_matrix_set(mnew, i, k, val);
-	}
+        for (k = 0; k < m->size2; k++) {
+          val = (*func)(f, f2, gsl_matrix_get(m, i, k));
+          gsl_matrix_set(mnew, i, k, val);
+        }
       }
       return Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, mnew);
     } else {
@@ -557,8 +542,8 @@ VALUE rb_gsl_sf_eval_double3(double (*func)(double, double, double),
       n = v->size;
       vnew = gsl_vector_alloc(n);
       for (i = 0; i < n; i++) {
-	val = (*func)(f, f2, gsl_vector_get(v, i));
-	gsl_vector_set(vnew, i, val);
+        val = (*func)(f, f2, gsl_vector_get(v, i));
+        gsl_vector_set(vnew, i, val);
       }
       return Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, vnew);
     }
@@ -566,18 +551,14 @@ VALUE rb_gsl_sf_eval_double3(double (*func)(double, double, double),
   }
 }
 
-VALUE rb_gsl_sf_eval_double4(double (*func)(double, double, double, double), 
-			     VALUE ff, VALUE ff2, VALUE ff3, VALUE argv)
+VALUE rb_gsl_sf_eval_double4(double (*func)(double, double, double, double),
+                             VALUE ff, VALUE ff2, VALUE ff3, VALUE argv)
 {
   gsl_vector *v = NULL, *vnew = NULL;
   gsl_matrix *m = NULL, *mnew = NULL;
   VALUE ary, xx;
   size_t i, k, n;
   double val, f, f2, f3;
-#ifdef HAVE_NARRAY_H
-  double *ptr1, *ptr2;
-  struct NARRAY *na;
-#endif
   Need_Float(ff); Need_Float(ff2); Need_Float(ff3);
   f = NUM2DBL(ff);
   f2 = NUM2DBL(ff2);
@@ -603,6 +584,8 @@ VALUE rb_gsl_sf_eval_double4(double (*func)(double, double, double, double),
   default:
 #ifdef HAVE_NARRAY_H
     if (NA_IsNArray(argv)) {
+      double *ptr1, *ptr2;
+      struct NARRAY *na;
       argv = na_change_type(argv, NA_DFLOAT);
       ptr1 = NA_PTR_TYPE(argv, double*);
       GetNArray(argv, na);
@@ -617,10 +600,10 @@ VALUE rb_gsl_sf_eval_double4(double (*func)(double, double, double, double),
       Data_Get_Struct(argv, gsl_matrix, m);
       mnew = gsl_matrix_alloc(m->size1, m->size2);
       for (i = 0; i < m->size1; i++) {
-	for (k = 0; k < m->size2; k++) {
-	  val = (*func)(f, f2, f3, gsl_matrix_get(m, i, k));
-	  gsl_matrix_set(mnew, i, k, val);
-	}
+        for (k = 0; k < m->size2; k++) {
+          val = (*func)(f, f2, f3, gsl_matrix_get(m, i, k));
+          gsl_matrix_set(mnew, i, k, val);
+        }
       }
       return Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, mnew);
     } else {
@@ -629,8 +612,8 @@ VALUE rb_gsl_sf_eval_double4(double (*func)(double, double, double, double),
       n = v->size;
       vnew = gsl_vector_alloc(n);
       for (i = 0; i < n; i++) {
-	val = (*func)(f, f2, f3, gsl_vector_get(v, i));
-	gsl_vector_set(vnew, i, val);
+        val = (*func)(f, f2, f3, gsl_vector_get(v, i));
+        gsl_vector_set(vnew, i, val);
       }
       return Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, vnew);
     }
@@ -645,10 +628,6 @@ VALUE rb_gsl_sf_eval1_int(double (*func)(int), VALUE argv)
   VALUE ary;
   size_t i, k, n;
   double val;
-#ifdef HAVE_NARRAY_H
-  double *ptr1, *ptr2;
-  struct NARRAY *na;
-#endif
   if (CLASS_OF(argv) == rb_cRange) argv = rb_gsl_range2ary(argv);
   switch (TYPE(argv)) {
   case T_FIXNUM:
@@ -668,6 +647,8 @@ VALUE rb_gsl_sf_eval1_int(double (*func)(int), VALUE argv)
   default:
 #ifdef HAVE_NARRAY_H
     if (NA_IsNArray(argv)) {
+      double *ptr1, *ptr2;
+      struct NARRAY *na;
       argv = na_change_type(argv, NA_DFLOAT);
       ptr1 = NA_PTR_TYPE(argv, double*);
       GetNArray(argv, na);
@@ -682,10 +663,10 @@ VALUE rb_gsl_sf_eval1_int(double (*func)(int), VALUE argv)
       Data_Get_Struct(argv, gsl_matrix, m);
       mnew = gsl_matrix_alloc(m->size1, m->size2);
       for (i = 0; i < m->size1; i++) {
-	for (k = 0; k < m->size2; k++) {
-	  val = (*func)((int) gsl_matrix_get(m, i, k));
-	  gsl_matrix_set(mnew, i, k, val);
-	}
+        for (k = 0; k < m->size2; k++) {
+          val = (*func)((int) gsl_matrix_get(m, i, k));
+          gsl_matrix_set(mnew, i, k, val);
+        }
       }
       return Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, mnew);
     } else {
@@ -694,8 +675,8 @@ VALUE rb_gsl_sf_eval1_int(double (*func)(int), VALUE argv)
       n = v->size;
       vnew = gsl_vector_alloc(n);
       for (i = 0; i < n; i++) {
-	val = (*func)((int) gsl_vector_get(v, i));
-	gsl_vector_set(vnew, i, val);
+        val = (*func)((int) gsl_vector_get(v, i));
+        gsl_vector_set(vnew, i, val);
       }
       return Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, vnew);
     }
@@ -710,10 +691,6 @@ VALUE rb_gsl_sf_eval1_uint(double (*func)(unsigned int), VALUE argv)
   VALUE ary;
   size_t i, k, n;
   double val;
-#ifdef HAVE_NARRAY_H
-  double *ptr1, *ptr2;
-  struct NARRAY *na;
-#endif
   if (CLASS_OF(argv) == rb_cRange) argv = rb_gsl_range2ary(argv);
   switch (TYPE(argv)) {
   case T_FIXNUM:
@@ -733,6 +710,8 @@ VALUE rb_gsl_sf_eval1_uint(double (*func)(unsigned int), VALUE argv)
   default:
 #ifdef HAVE_NARRAY_H
     if (NA_IsNArray(argv)) {
+      double *ptr1, *ptr2;
+      struct NARRAY *na;
       argv = na_change_type(argv, NA_DFLOAT);
       ptr1 = NA_PTR_TYPE(argv, double*);
       GetNArray(argv, na);
@@ -747,10 +726,10 @@ VALUE rb_gsl_sf_eval1_uint(double (*func)(unsigned int), VALUE argv)
       Data_Get_Struct(argv, gsl_matrix, m);
       mnew = gsl_matrix_alloc(m->size1, m->size2);
       for (i = 0; i < m->size1; i++) {
-	for (k = 0; k < m->size2; k++) {
-	  val = (*func)((unsigned int) gsl_matrix_get(m, i, k));
-	  gsl_matrix_set(mnew, i, k, val);
-	}
+        for (k = 0; k < m->size2; k++) {
+          val = (*func)((unsigned int) gsl_matrix_get(m, i, k));
+          gsl_matrix_set(mnew, i, k, val);
+        }
       }
       return Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, mnew);
     } else {
@@ -759,8 +738,8 @@ VALUE rb_gsl_sf_eval1_uint(double (*func)(unsigned int), VALUE argv)
       n = v->size;
       vnew = gsl_vector_alloc(n);
       for (i = 0; i < n; i++) {
-	val = (*func)((unsigned int) gsl_vector_get(v, i));
-	gsl_vector_set(vnew, i, val);
+        val = (*func)((unsigned int) gsl_vector_get(v, i));
+        gsl_vector_set(vnew, i, val);
       }
       return Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, vnew);
     }
@@ -775,26 +754,22 @@ VALUE rb_gsl_sf_eval_double_m(double (*func)(double, gsl_mode_t), VALUE argv, VA
   VALUE ary, xx;
   size_t i, k, n;
   double val;
-  gsl_mode_t mode;
-  char c;
-#ifdef HAVE_NARRAY_H
-  double *ptr1, *ptr2;
-  struct NARRAY *na;
-#endif
+  /*gsl_mode_t mode;
+  char c;*/
   switch (TYPE(m)) {
   case T_STRING:
-    c = tolower(NUM2CHR(m));
+    /*c = tolower(NUM2CHR(m));
     if (c == 'd') mode = GSL_PREC_DOUBLE;
     else if (c == 's') mode = GSL_PREC_SINGLE;
     else if (c == 'a') mode = GSL_PREC_APPROX;
-    else mode = GSL_PREC_DOUBLE;
+    else mode = GSL_PREC_DOUBLE;*/
     break;
   case T_FIXNUM:
-    mode = FIX2INT(m);
+    /*mode = FIX2INT(m);*/
     break;
   default:
     rb_raise(rb_eArgError, "wrong type argument %s (String or Fixnum expected)",
-	     rb_class2name(CLASS_OF(m)));
+             rb_class2name(CLASS_OF(m)));
   }
   if (CLASS_OF(argv) == rb_cRange) argv = rb_gsl_range2ary(argv);
   switch (TYPE(argv)) {
@@ -817,6 +792,8 @@ VALUE rb_gsl_sf_eval_double_m(double (*func)(double, gsl_mode_t), VALUE argv, VA
   default:
 #ifdef HAVE_NARRAY_H
     if (NA_IsNArray(argv)) {
+      double *ptr1, *ptr2;
+      struct NARRAY *na;
       ptr1 = NA_PTR_TYPE(argv, double*);
       GetNArray(argv, na);
       n = na->total;
@@ -830,10 +807,10 @@ VALUE rb_gsl_sf_eval_double_m(double (*func)(double, gsl_mode_t), VALUE argv, VA
       Data_Get_Struct(argv, gsl_matrix, mm);
       mnew = gsl_matrix_alloc(mm->size1, mm->size2);
       for (i = 0; i < mm->size1; i++) {
-	for (k = 0; k < mm->size2; k++) {
-	  val = (*func)(gsl_matrix_get(mm, i, k), m);
-	  gsl_matrix_set(mnew, i, k, val);
-	}
+        for (k = 0; k < mm->size2; k++) {
+          val = (*func)(gsl_matrix_get(mm, i, k), m);
+          gsl_matrix_set(mnew, i, k, val);
+        }
       }
       return Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, mnew);
     } else {
@@ -842,8 +819,8 @@ VALUE rb_gsl_sf_eval_double_m(double (*func)(double, gsl_mode_t), VALUE argv, VA
       n = v->size;
       vnew = gsl_vector_alloc(n);
       for (i = 0; i < n; i++) {
-	val = (*func)(gsl_vector_get(v, i), m);
-	gsl_vector_set(vnew, i, val);
+        val = (*func)(gsl_vector_get(v, i), m);
+        gsl_vector_set(vnew, i, val);
       }
       return Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, vnew);
     }
@@ -851,27 +828,23 @@ VALUE rb_gsl_sf_eval_double_m(double (*func)(double, gsl_mode_t), VALUE argv, VA
   }
 }
 
-VALUE rb_gsl_sf_eval_double2_m(double (*func)(double, double, gsl_mode_t), 
-			       VALUE argv, VALUE x2, VALUE m)
+VALUE rb_gsl_sf_eval_double2_m(double (*func)(double, double, gsl_mode_t),
+                               VALUE argv, VALUE x2, VALUE m)
 {
   gsl_vector *v = NULL, *vnew = NULL;
   gsl_matrix *mm = NULL, *mnew = NULL;
   VALUE ary, xx;
   size_t i, k, n;
   double val, xx2;
-  gsl_mode_t mode;
-  char c;
-#ifdef HAVE_NARRAY_H
-  double *ptr1, *ptr2;
-  struct NARRAY *na;
-#endif
+  /*gsl_mode_t mode;
+  char c;*/
   Need_Float(x2);
   xx2 = NUM2DBL(x2);
-  c = tolower(NUM2CHR(m));
+  /*c = tolower(NUM2CHR(m));
   if (c == 'd') mode = GSL_PREC_DOUBLE;
   else if (c == 's') mode = GSL_PREC_SINGLE;
   else if (c == 'a') mode = GSL_PREC_APPROX;
-  else mode = GSL_PREC_DOUBLE;
+  else mode = GSL_PREC_DOUBLE;*/
   if (CLASS_OF(argv) == rb_cRange) argv = rb_gsl_range2ary(argv);
   switch (TYPE(argv)) {
   case T_FLOAT:
@@ -893,6 +866,8 @@ VALUE rb_gsl_sf_eval_double2_m(double (*func)(double, double, gsl_mode_t),
   default:
 #ifdef HAVE_NARRAY_H
     if (NA_IsNArray(argv)) {
+      double *ptr1, *ptr2;
+      struct NARRAY *na;
       ptr1 = NA_PTR_TYPE(argv, double*);
       GetNArray(argv, na);
       n = na->total;
@@ -906,10 +881,10 @@ VALUE rb_gsl_sf_eval_double2_m(double (*func)(double, double, gsl_mode_t),
       Data_Get_Struct(argv, gsl_matrix, mm);
       mnew = gsl_matrix_alloc(mm->size1, mm->size2);
       for (i = 0; i < mm->size1; i++) {
-	for (k = 0; k < mm->size2; k++) {
-	  val = (*func)(gsl_matrix_get(mm, i, k), xx2, m);
-	  gsl_matrix_set(mnew, i, k, val);
-	}
+        for (k = 0; k < mm->size2; k++) {
+          val = (*func)(gsl_matrix_get(mm, i, k), xx2, m);
+          gsl_matrix_set(mnew, i, k, val);
+        }
       }
       return Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, mnew);
     } else {
@@ -918,8 +893,8 @@ VALUE rb_gsl_sf_eval_double2_m(double (*func)(double, double, gsl_mode_t),
       n = v->size;
       vnew = gsl_vector_alloc(n);
       for (i = 0; i < n; i++) {
-	val = (*func)(gsl_vector_get(v, i), xx2, m);
-	gsl_vector_set(vnew, i, val);
+        val = (*func)(gsl_vector_get(v, i), xx2, m);
+        gsl_vector_set(vnew, i, val);
       }
       return Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, vnew);
     }
@@ -927,28 +902,24 @@ VALUE rb_gsl_sf_eval_double2_m(double (*func)(double, double, gsl_mode_t),
   }
 }
 
-VALUE rb_gsl_sf_eval_double3_m(double (*func)(double, double, double, gsl_mode_t), 
-			       VALUE argv, VALUE x2, VALUE x3, VALUE m)
+VALUE rb_gsl_sf_eval_double3_m(double (*func)(double, double, double, gsl_mode_t),
+                               VALUE argv, VALUE x2, VALUE x3, VALUE m)
 {
   gsl_vector *v = NULL, *vnew = NULL;
   gsl_matrix *mm = NULL, *mnew = NULL;
   VALUE ary, xx;
   size_t i, k, n;
   double val, xx2, xx3;
-  gsl_mode_t mode;
-  char c;
-#ifdef HAVE_NARRAY_H
-  double *ptr1, *ptr2;
-  struct NARRAY *na;
-#endif
+  /*gsl_mode_t mode;
+  char c;*/
   Need_Float(x2); Need_Float(x3);
   xx2 = NUM2DBL(x2);
   xx3 = NUM2DBL(x3);
-  c = tolower(NUM2CHR(m));
+  /*c = tolower(NUM2CHR(m));
   if (c == 'd') mode = GSL_PREC_DOUBLE;
   else if (c == 's') mode = GSL_PREC_SINGLE;
   else if (c == 'a') mode = GSL_PREC_APPROX;
-  else mode = GSL_PREC_DOUBLE;
+  else mode = GSL_PREC_DOUBLE;*/
   if (CLASS_OF(argv) == rb_cRange) argv = rb_gsl_range2ary(argv);
   switch (TYPE(argv)) {
   case T_FLOAT:
@@ -970,6 +941,8 @@ VALUE rb_gsl_sf_eval_double3_m(double (*func)(double, double, double, gsl_mode_t
   default:
 #ifdef HAVE_NARRAY_H
     if (NA_IsNArray(argv)) {
+      double *ptr1, *ptr2;
+      struct NARRAY *na;
       ptr1 = NA_PTR_TYPE(argv, double*);
       GetNArray(argv, na);
       n = na->total;
@@ -983,10 +956,10 @@ VALUE rb_gsl_sf_eval_double3_m(double (*func)(double, double, double, gsl_mode_t
       Data_Get_Struct(argv, gsl_matrix, mm);
       mnew = gsl_matrix_alloc(mm->size1, mm->size2);
       for (i = 0; i < mm->size1; i++) {
-	for (k = 0; k < mm->size2; k++) {
-	  val = (*func)(gsl_matrix_get(mm, i, k), xx2, xx3, m);
-	  gsl_matrix_set(mnew, i, k, val);
-	}
+        for (k = 0; k < mm->size2; k++) {
+          val = (*func)(gsl_matrix_get(mm, i, k), xx2, xx3, m);
+          gsl_matrix_set(mnew, i, k, val);
+        }
       }
       return Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, mnew);
     } else {
@@ -995,8 +968,8 @@ VALUE rb_gsl_sf_eval_double3_m(double (*func)(double, double, double, gsl_mode_t
       n = v->size;
       vnew = gsl_vector_alloc(n);
       for (i = 0; i < n; i++) {
-	val = (*func)(gsl_vector_get(v, i), xx2, xx3, m);
-	gsl_vector_set(vnew, i, val);
+        val = (*func)(gsl_vector_get(v, i), xx2, xx3, m);
+        gsl_vector_set(vnew, i, val);
       }
       return Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, vnew);
     }
@@ -1005,34 +978,30 @@ VALUE rb_gsl_sf_eval_double3_m(double (*func)(double, double, double, gsl_mode_t
 }
 
 VALUE rb_gsl_sf_eval_double4_m(double (*func)(double, double, double, double,
-					      gsl_mode_t), 
-			       VALUE argv, VALUE x2, VALUE x3, VALUE x4, VALUE m)
+                                              gsl_mode_t),
+                               VALUE argv, VALUE x2, VALUE x3, VALUE x4, VALUE m)
 {
   gsl_vector *v = NULL, *vnew = NULL;
   gsl_matrix *mm = NULL, *mnew = NULL;
   VALUE ary, xx;
   size_t i, k, n;
   double val, xx2, xx3, xx4;
-  gsl_mode_t mode;
-  char c;
-#ifdef HAVE_NARRAY_H
-  double *ptr1, *ptr2;
-  struct NARRAY *na;
-#endif
+  /*gsl_mode_t mode;
+  char c;*/
   Need_Float(x2); Need_Float(x3); Need_Float(x4);
   xx2 = NUM2DBL(x2);  xx3 = NUM2DBL(x3); xx4 = NUM2DBL(x4);
-  c = tolower(NUM2CHR(m));
+  /*c = tolower(NUM2CHR(m));
   if (c == 'd') mode = GSL_PREC_DOUBLE;
   else if (c == 's') mode = GSL_PREC_SINGLE;
   else if (c == 'a') mode = GSL_PREC_APPROX;
-  else mode = GSL_PREC_DOUBLE;
+  else mode = GSL_PREC_DOUBLE;*/
   if (CLASS_OF(argv) == rb_cRange) argv = rb_gsl_range2ary(argv);
   switch (TYPE(argv)) {
   case T_FLOAT:
   case T_FIXNUM:
   case T_BIGNUM:
     return rb_float_new((*func)(NUM2DBL(argv), NUM2DBL(x2), NUM2DBL(x3),
-				NUM2DBL(x4), m));
+                                NUM2DBL(x4), m));
     break;
   case T_ARRAY:
     n = RARRAY_LEN(argv);
@@ -1048,6 +1017,8 @@ VALUE rb_gsl_sf_eval_double4_m(double (*func)(double, double, double, double,
   default:
 #ifdef HAVE_NARRAY_H
     if (NA_IsNArray(argv)) {
+      double *ptr1, *ptr2;
+      struct NARRAY *na;
       ptr1 = NA_PTR_TYPE(argv, double*);
       GetNArray(argv, na);
       n = na->total;
@@ -1061,10 +1032,10 @@ VALUE rb_gsl_sf_eval_double4_m(double (*func)(double, double, double, double,
       Data_Get_Struct(argv, gsl_matrix, mm);
       mnew = gsl_matrix_alloc(mm->size1, mm->size2);
       for (i = 0; i < mm->size1; i++) {
-	for (k = 0; k < mm->size2; k++) {
-	  val = (*func)(gsl_matrix_get(mm, i, k), xx2, xx3, xx4, m);
-	  gsl_matrix_set(mnew, i, k, val);
-	}
+        for (k = 0; k < mm->size2; k++) {
+          val = (*func)(gsl_matrix_get(mm, i, k), xx2, xx3, xx4, m);
+          gsl_matrix_set(mnew, i, k, val);
+        }
       }
       return Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, mnew);
     } else {
@@ -1073,8 +1044,8 @@ VALUE rb_gsl_sf_eval_double4_m(double (*func)(double, double, double, double,
       n = v->size;
       vnew = gsl_vector_alloc(n);
       for (i = 0; i < n; i++) {
-	val = (*func)(gsl_vector_get(v, i),  xx2, xx3, xx4, m);
-	gsl_vector_set(vnew, i, val);
+        val = (*func)(gsl_vector_get(v, i),  xx2, xx3, xx4, m);
+        gsl_vector_set(vnew, i, val);
       }
       return Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, vnew);
     }
@@ -1086,10 +1057,9 @@ VALUE rb_gsl_sf_eval_e(int (*func)(double, gsl_sf_result*), VALUE x)
 {
   gsl_sf_result *rslt = NULL;
   VALUE v;
-  int status;
   Need_Float(x);
   v = Data_Make_Struct(cgsl_sf_result, gsl_sf_result, 0, free, rslt);
-  status = (*func)(NUM2DBL(x), rslt);
+  (*func)(NUM2DBL(x), rslt);
   return v;
 }
 
@@ -1097,10 +1067,9 @@ VALUE rb_gsl_sf_eval_e_int(int (*func)(int, gsl_sf_result*), VALUE x)
 {
   gsl_sf_result *rslt = NULL;
   VALUE v;
-  int status;
   CHECK_FIXNUM(x);
   v = Data_Make_Struct(cgsl_sf_result, gsl_sf_result, 0, free, rslt);
-  status = (*func)(NUM2INT(x), rslt);
+  (*func)(NUM2INT(x), rslt);
   return v;
 }
 
@@ -1108,109 +1077,100 @@ VALUE rb_gsl_sf_eval_e_uint(int (*func)(unsigned int, gsl_sf_result*), VALUE x)
 {
   gsl_sf_result *rslt = NULL;
   VALUE v;
-  int status;
   v = Data_Make_Struct(cgsl_sf_result, gsl_sf_result, 0, free, rslt);
-  status = (*func)(NUM2UINT(x), rslt);
+  (*func)(NUM2UINT(x), rslt);
   return v;
 }
 
-VALUE rb_gsl_sf_eval_e_int_uint(int (*func)(int, unsigned int, gsl_sf_result*), 
-				VALUE n, VALUE x)
+VALUE rb_gsl_sf_eval_e_int_uint(int (*func)(int, unsigned int, gsl_sf_result*),
+                                VALUE n, VALUE x)
 {
   gsl_sf_result *rslt = NULL;
   VALUE v;
-  int status;
   CHECK_FIXNUM(n);
   v = Data_Make_Struct(cgsl_sf_result, gsl_sf_result, 0, free, rslt);
-  status = (*func)(FIX2INT(n), NUM2UINT(x), rslt);
+  (*func)(FIX2INT(n), NUM2UINT(x), rslt);
   return v;
 }
 
-VALUE rb_gsl_sf_eval_e_double_uint(int (*func)(double, unsigned int, gsl_sf_result*), 
-				VALUE y, VALUE x)
+VALUE rb_gsl_sf_eval_e_double_uint(int (*func)(double, unsigned int, gsl_sf_result*),
+                                   VALUE y, VALUE x)
 {
   gsl_sf_result *rslt = NULL;
   VALUE v;
-  int status;
   Need_Float(y);
   v = Data_Make_Struct(cgsl_sf_result, gsl_sf_result, 0, free, rslt);
-  status = (*func)(NUM2DBL(y), NUM2UINT(x), rslt);
+  (*func)(NUM2DBL(y), NUM2UINT(x), rslt);
   return v;
 }
 
-VALUE rb_gsl_sf_eval_e_int_double(int (*func)(int, double, gsl_sf_result*), 
-				  VALUE n, VALUE x)
+VALUE rb_gsl_sf_eval_e_int_double(int (*func)(int, double, gsl_sf_result*),
+                                  VALUE n, VALUE x)
 {
   gsl_sf_result *rslt = NULL;
   VALUE v;
-  int status;
   CHECK_FIXNUM(n);
   Need_Float(x);
   v = Data_Make_Struct(cgsl_sf_result, gsl_sf_result, 0, free, rslt);
-  status = (*func)(FIX2INT(n), NUM2DBL(x), rslt);
+  (*func)(FIX2INT(n), NUM2DBL(x), rslt);
   return v;
 }
 
-VALUE rb_gsl_sf_eval_e_int_double2(int (*func)(int, double, double, gsl_sf_result*), 
-				  VALUE n, VALUE x1, VALUE x2)
+VALUE rb_gsl_sf_eval_e_int_double2(int (*func)(int, double, double, gsl_sf_result*),
+                                   VALUE n, VALUE x1, VALUE x2)
 {
   gsl_sf_result *rslt = NULL;
   VALUE v;
-  int status;
   CHECK_FIXNUM(n);
   Need_Float(x1); Need_Float(x2);
   v = Data_Make_Struct(cgsl_sf_result, gsl_sf_result, 0, free, rslt);
-  status = (*func)(FIX2INT(n), NUM2DBL(x1), NUM2DBL(x2), rslt);
+  (*func)(FIX2INT(n), NUM2DBL(x1), NUM2DBL(x2), rslt);
   return v;
 }
 
 
-VALUE rb_gsl_sf_eval_e_int_int_double(int (*func)(int, int, double, gsl_sf_result*), 
-				      VALUE n1, VALUE n2, VALUE x)
+VALUE rb_gsl_sf_eval_e_int_int_double(int (*func)(int, int, double, gsl_sf_result*),
+                                      VALUE n1, VALUE n2, VALUE x)
 {
   gsl_sf_result *rslt = NULL;
   VALUE v;
-  int status;
   CHECK_FIXNUM(n1); CHECK_FIXNUM(n2);
   Need_Float(x);
   v = Data_Make_Struct(cgsl_sf_result, gsl_sf_result, 0, free, rslt);
-  status = (*func)(FIX2INT(n1), FIX2INT(n2), NUM2DBL(x), rslt);
+  (*func)(FIX2INT(n1), FIX2INT(n2), NUM2DBL(x), rslt);
   return v;
 }
 
-VALUE rb_gsl_sf_eval_e_double2(int (*func)(double, double, gsl_sf_result*), 
-				  VALUE x1, VALUE x2)
+VALUE rb_gsl_sf_eval_e_double2(int (*func)(double, double, gsl_sf_result*),
+                               VALUE x1, VALUE x2)
 {
   gsl_sf_result *rslt = NULL;
   VALUE v;
-  int status;
-  Need_Float(x1); Need_Float(x2); 
+  Need_Float(x1); Need_Float(x2);
   v = Data_Make_Struct(cgsl_sf_result, gsl_sf_result, 0, free, rslt);
-  status = (*func)(NUM2DBL(x1), NUM2DBL(x2), rslt);
+  (*func)(NUM2DBL(x1), NUM2DBL(x2), rslt);
   return v;
 }
 
 
-VALUE rb_gsl_sf_eval_e_double3(int (*func)(double, double, double, gsl_sf_result*), 
-				  VALUE x1, VALUE x2, VALUE x3)
+VALUE rb_gsl_sf_eval_e_double3(int (*func)(double, double, double, gsl_sf_result*),
+                               VALUE x1, VALUE x2, VALUE x3)
 {
   gsl_sf_result *rslt = NULL;
   VALUE v;
-  int status;
   Need_Float(x1); Need_Float(x2); Need_Float(x3);
   v = Data_Make_Struct(cgsl_sf_result, gsl_sf_result, 0, free, rslt);
-  status = (*func)(NUM2DBL(x1), NUM2DBL(x2),NUM2DBL(x3), rslt);
+  (*func)(NUM2DBL(x1), NUM2DBL(x2),NUM2DBL(x3), rslt);
   return v;
 }
 
-VALUE rb_gsl_sf_eval_e_m(int (*func)(double, gsl_mode_t, gsl_sf_result*), 
-			 VALUE x, VALUE m)
+VALUE rb_gsl_sf_eval_e_m(int (*func)(double, gsl_mode_t, gsl_sf_result*),
+                         VALUE x, VALUE m)
 {
   gsl_mode_t mode;
   char c;
   gsl_sf_result *rslt = NULL;
   VALUE v;
-  int status;
   Need_Float(x);
   switch (TYPE(m)) {
   case T_STRING:
@@ -1225,23 +1185,22 @@ VALUE rb_gsl_sf_eval_e_m(int (*func)(double, gsl_mode_t, gsl_sf_result*),
     break;
   default:
     rb_raise(rb_eArgError, "wrong type argument %s (String or Fixnum expected)",
-	     rb_class2name(CLASS_OF(m)));
+             rb_class2name(CLASS_OF(m)));
     break;
   }
   v = Data_Make_Struct(cgsl_sf_result, gsl_sf_result, 0, free, rslt);
-  status = (*func)(NUM2DBL(x), mode, rslt);
+  (*func)(NUM2DBL(x), mode, rslt);
   return v;
 }
 
 
-VALUE rb_gsl_sf_eval_e_double2_m(int (*func)(double, double, gsl_mode_t, gsl_sf_result*), 
-			 VALUE x1, VALUE x2, VALUE m)
+VALUE rb_gsl_sf_eval_e_double2_m(int (*func)(double, double, gsl_mode_t, gsl_sf_result*),
+                                 VALUE x1, VALUE x2, VALUE m)
 {
   gsl_mode_t mode;
   char c;
   gsl_sf_result *rslt = NULL;
   VALUE v;
-  int status;
   Need_Float(x1);  Need_Float(x2);
   switch (TYPE(m)) {
   case T_STRING:
@@ -1256,22 +1215,21 @@ VALUE rb_gsl_sf_eval_e_double2_m(int (*func)(double, double, gsl_mode_t, gsl_sf_
     break;
   default:
     rb_raise(rb_eArgError, "wrong type argument %s (String or Fixnum expected)",
-	     rb_class2name(CLASS_OF(m)));
+             rb_class2name(CLASS_OF(m)));
     break;
   }
   v = Data_Make_Struct(cgsl_sf_result, gsl_sf_result, 0, free, rslt);
-  status = (*func)(NUM2DBL(x1), NUM2DBL(x2), mode, rslt);
+  (*func)(NUM2DBL(x1), NUM2DBL(x2), mode, rslt);
   return v;
 }
 
-VALUE rb_gsl_sf_eval_e_double3_m(int (*func)(double, double, double, gsl_mode_t, gsl_sf_result*), 
-			 VALUE x1, VALUE x2, VALUE x3, VALUE m)
+VALUE rb_gsl_sf_eval_e_double3_m(int (*func)(double, double, double, gsl_mode_t, gsl_sf_result*),
+                                 VALUE x1, VALUE x2, VALUE x3, VALUE m)
 {
   gsl_mode_t mode;
   char c;
   gsl_sf_result *rslt = NULL;
   VALUE v;
-  int status;
   Need_Float(x1); Need_Float(x2); Need_Float(x3);
   switch (TYPE(m)) {
   case T_STRING:
@@ -1286,23 +1244,22 @@ VALUE rb_gsl_sf_eval_e_double3_m(int (*func)(double, double, double, gsl_mode_t,
     break;
   default:
     rb_raise(rb_eArgError, "wrong type argument %s (String or Fixnum expected)",
-	     rb_class2name(CLASS_OF(m)));
+             rb_class2name(CLASS_OF(m)));
     break;
   }
   v = Data_Make_Struct(cgsl_sf_result, gsl_sf_result, 0, free, rslt);
-  status = (*func)(NUM2DBL(x1), NUM2DBL(x2),NUM2DBL(x3), mode, rslt);
+  (*func)(NUM2DBL(x1), NUM2DBL(x2),NUM2DBL(x3), mode, rslt);
   return v;
 }
 
 
-VALUE rb_gsl_sf_eval_e_double4_m(int (*func)(double, double, double, double, gsl_mode_t, gsl_sf_result*), 
-			 VALUE x1, VALUE x2, VALUE x3, VALUE x4, VALUE m)
+VALUE rb_gsl_sf_eval_e_double4_m(int (*func)(double, double, double, double, gsl_mode_t, gsl_sf_result*),
+                                 VALUE x1, VALUE x2, VALUE x3, VALUE x4, VALUE m)
 {
   gsl_mode_t mode;
   char c;
   gsl_sf_result *rslt = NULL;
   VALUE v;
-  int status;
   Need_Float(x1); Need_Float(x2); Need_Float(x3); Need_Float(x4);
   switch (TYPE(m)) {
   case T_STRING:
@@ -1317,11 +1274,11 @@ VALUE rb_gsl_sf_eval_e_double4_m(int (*func)(double, double, double, double, gsl
     break;
   default:
     rb_raise(rb_eArgError, "wrong type argument %s (String or Fixnum expected)",
-	     rb_class2name(CLASS_OF(m)));
+             rb_class2name(CLASS_OF(m)));
     break;
-  }    
+  }
   v = Data_Make_Struct(cgsl_sf_result, gsl_sf_result, 0, free, rslt);
-  status = (*func)(NUM2DBL(x1), NUM2DBL(x2),NUM2DBL(x3), NUM2DBL(x4), mode, rslt);
+  (*func)(NUM2DBL(x1), NUM2DBL(x2),NUM2DBL(x3), NUM2DBL(x4), mode, rslt);
   return v;
 }
 
@@ -1333,10 +1290,6 @@ VALUE eval_sf(double (*func)(double, gsl_mode_t), VALUE argv)
   double val;
   gsl_vector *v = NULL, *vnew = NULL;
   gsl_matrix *mm = NULL, *mnew = NULL;
-#ifdef HAVE_NARRAY_H
-  double *ptr1, *ptr2;
-  struct NARRAY *na;
-#endif
   switch (TYPE(argv)) {
   case T_FLOAT:
   case T_FIXNUM:
@@ -1357,6 +1310,8 @@ VALUE eval_sf(double (*func)(double, gsl_mode_t), VALUE argv)
   default:
 #ifdef HAVE_NARRAY_H
     if (NA_IsNArray(argv)) {
+      double *ptr1, *ptr2;
+      struct NARRAY *na;
       ptr1 = NA_PTR_TYPE(argv, double*);
       GetNArray(argv, na);
       n = na->total;
@@ -1370,10 +1325,10 @@ VALUE eval_sf(double (*func)(double, gsl_mode_t), VALUE argv)
       Data_Get_Struct(argv, gsl_matrix, mm);
       mnew = gsl_matrix_alloc(mm->size1, mm->size2);
       for (i = 0; i < mm->size1; i++) {
-	for (k = 0; k < mm->size2; k++) {
-	  val = (*func)(gsl_matrix_get(mm, i, k), GSL_PREC_DOUBLE);
-	  gsl_matrix_set(mnew, i, k, val);
-	}
+        for (k = 0; k < mm->size2; k++) {
+          val = (*func)(gsl_matrix_get(mm, i, k), GSL_PREC_DOUBLE);
+          gsl_matrix_set(mnew, i, k, val);
+        }
       }
       return Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, mnew);
     } else {
@@ -1382,8 +1337,8 @@ VALUE eval_sf(double (*func)(double, gsl_mode_t), VALUE argv)
       n = v->size;
       vnew = gsl_vector_alloc(n);
       for (i = 0; i < n; i++) {
-	val = (*func)(gsl_vector_get(v, i), GSL_PREC_DOUBLE);
-	gsl_vector_set(vnew, i, val);
+        val = (*func)(gsl_vector_get(v, i), GSL_PREC_DOUBLE);
+        gsl_vector_set(vnew, i, val);
       }
       return Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, vnew);
     }
@@ -1418,18 +1373,18 @@ VALUE rb_gsl_sf_eval_complex(double (*f)(double), VALUE obj)
     mnew = gsl_matrix_complex_alloc(m->size1, m->size2);
     for (i = 0; i < m->size1; i++) {
       for (j = 0; j < m->size2; j++) {
-	c = gsl_matrix_complex_get(m, i, j);
-	GSL_SET_REAL(&c, (*f)(GSL_REAL(c)));
-	GSL_SET_IMAG(&c, (*f)(GSL_IMAG(c)));
-	gsl_matrix_complex_set(mnew, i, j, c);
+        c = gsl_matrix_complex_get(m, i, j);
+        GSL_SET_REAL(&c, (*f)(GSL_REAL(c)));
+        GSL_SET_IMAG(&c, (*f)(GSL_IMAG(c)));
+        gsl_matrix_complex_set(mnew, i, j, c);
       }
     }
     return Data_Wrap_Struct(cgsl_matrix_complex, 0, gsl_matrix_complex_free, mnew);
   } else {
-    rb_raise(rb_eTypeError, 
-	     "wrong argument type %s "
-	     " (GSL::Complex or GSL::Vector::Complex expected)", 
-	     rb_class2name(CLASS_OF(obj)));
+    rb_raise(rb_eTypeError,
+             "wrong argument type %s "
+             " (GSL::Complex or GSL::Vector::Complex expected)",
+             rb_class2name(CLASS_OF(obj)));
   }
 }
 
@@ -1438,10 +1393,10 @@ void Init_gsl_sf(VALUE module)
   VALUE mgsl_sf;
   mgsl_sf = rb_define_module_under(module, "Sf");
 
-  cgsl_sf_result = rb_define_class_under(mgsl_sf, "Result", 
-					 cGSL_Object);
+  cgsl_sf_result = rb_define_class_under(mgsl_sf, "Result",
+                                         cGSL_Object);
   rb_define_singleton_method(cgsl_sf_result, "new", rb_gsl_sf_result_new,
-			     0);
+                             0);
   rb_define_method(cgsl_sf_result, "print", rb_gsl_sf_result_print, 0);
   rb_define_method(cgsl_sf_result, "inspect", rb_gsl_sf_result_inspect, 0);
   rb_define_method(cgsl_sf_result, "val", rb_gsl_sf_result_val, 0);
@@ -1449,10 +1404,10 @@ void Init_gsl_sf(VALUE module)
   rb_define_method(cgsl_sf_result, "to_a", rb_gsl_sf_result_to_a, 0);
   rb_define_method(cgsl_sf_result, "to_s", rb_gsl_sf_result_to_s, 0);
 
-  cgsl_sf_result_e10 = rb_define_class_under(mgsl_sf, "Result_e10", 
-					     cGSL_Object);
-  rb_define_singleton_method(cgsl_sf_result_e10, "new", 
-			     rb_gsl_sf_result_e10_new, 0);
+  cgsl_sf_result_e10 = rb_define_class_under(mgsl_sf, "Result_e10",
+                                             cGSL_Object);
+  rb_define_singleton_method(cgsl_sf_result_e10, "new",
+                             rb_gsl_sf_result_e10_new, 0);
   rb_define_method(cgsl_sf_result_e10, "val", rb_gsl_sf_result_e10_val, 0);
   rb_define_method(cgsl_sf_result_e10, "err", rb_gsl_sf_result_e10_err, 0);
   rb_define_method(cgsl_sf_result_e10, "e10", rb_gsl_sf_result_e10_e10, 0);
@@ -1487,8 +1442,5 @@ void Init_gsl_sf(VALUE module)
   Init_gsl_sf_transport(mgsl_sf);
   Init_gsl_sf_trigonometric(mgsl_sf);
   Init_gsl_sf_zeta(mgsl_sf);
-  
-#ifdef GSL_1_9_LATER  
-	Init_sf_mathieu(mgsl_sf);
-#endif
+  Init_sf_mathieu(mgsl_sf);
 }