rb-gsl 1.16.0.4 → 1.16.0.5

data/ext/{gsl → gsl_native}/rational.c

@@ -199,7 +199,7 @@ static VALUE rb_gsl_poly_make_rational(VALUE obj, VALUE other)
     case T_ARRAY:
       p2 = gsl_vector_alloc(RARRAY_LEN(other));
       for (i = 0; i < p2->size; i++)
-	gsl_vector_set(p2, i, NUM2DBL(rb_ary_entry(other, i)));
+        gsl_vector_set(p2, i, NUM2DBL(rb_ary_entry(other, i)));
       rnew = gsl_rational_new(p, p2);
       gsl_vector_free(p2);
       break;
@@ -210,8 +210,8 @@ static VALUE rb_gsl_poly_make_rational(VALUE obj, VALUE other)
       return Data_Wrap_Struct(cgsl_poly, 0, gsl_vector_free, p2);
       break;
     default:
-      rb_raise(rb_eTypeError, "wrong argument type %s", 
-	       rb_class2name(CLASS_OF(other)));
+      rb_raise(rb_eTypeError, "wrong argument type %s",
+               rb_class2name(CLASS_OF(other)));
       break;
     }
   }
@@ -280,7 +280,7 @@ static VALUE rb_gsl_rational_uminus(VALUE obj)
   if (RATIONAL_P(obj)) {
     Data_Get_Struct(obj, gsl_rational, r);
     rnew = gsl_rational_new(r->pnum, r->pden);
-    for (i = 0; i < rnew->pnum->size; i++) 
+    for (i = 0; i < rnew->pnum->size; i++)
       gsl_vector_set(rnew->pnum, i, -gsl_vector_get(r->pnum, i));
     return Data_Wrap_Struct(cgsl_rational, gsl_rational_mark, gsl_rational_free, rnew);
   } else {
@@ -342,7 +342,7 @@ static VALUE rb_gsl_rational_div(VALUE obj, VALUE other)
     case T_ARRAY:
       p = gsl_vector_alloc(RARRAY_LEN(other));
       for (i = 0; i < p->size; i++)
-	gsl_vector_set(p, i, NUM2DBL(rb_ary_entry(other, i)));
+        gsl_vector_set(p, i, NUM2DBL(rb_ary_entry(other, i)));
       rnew = gsl_rational_div_poly(r, p);
       gsl_vector_free(p);
       break;
@@ -352,8 +352,8 @@ static VALUE rb_gsl_rational_div(VALUE obj, VALUE other)
       gsl_vector_scale(rnew->pnum, 1.0/NUM2DBL(other));
       break;
     default:
-      rb_raise(rb_eTypeError, "wrong argument type %s", 
-	       rb_class2name(CLASS_OF(other)));
+      rb_raise(rb_eTypeError, "wrong argument type %s",
+               rb_class2name(CLASS_OF(other)));
       break;
     }
   }
@@ -407,8 +407,8 @@ static VALUE rb_gsl_rational_coerce(VALUE obj, VALUE other)
   ptmp = gsl_vector_alloc(1);
   gsl_vector_set(ptmp, 0, 1.0);
   r = gsl_rational_new2(p, ptmp);
-  return rb_ary_new3(2, 
-		     Data_Wrap_Struct(cgsl_rational, gsl_rational_mark, gsl_rational_free, r), obj);
+  return rb_ary_new3(2,
+                     Data_Wrap_Struct(cgsl_rational, gsl_rational_mark, gsl_rational_free, r), obj);
 }
 
 static VALUE rb_gsl_rational_zero(VALUE obj)

data/ext/{gsl → gsl_native}/rng.c

@@ -9,7 +9,7 @@
   WITHOUT ANY WARRANTY.
 */
 
-/* 
+/*
    Document-class: <i>GSL::Rng</i>
    Random number generator
 */
@@ -24,22 +24,22 @@ VALUE cgsl_rng;
 
 enum rb_gsl_rng_generator {
   GSL_RNG_DEFAULT,
-  GSL_RNG_MT19937, GSL_RNG_MT19937_1999, GSL_RNG_MT19937_1998, 
-  GSL_RNG_RANLXS0, GSL_RNG_RANLXS1, GSL_RNG_RANLXS2, 
-  GSL_RNG_RANLXD1, GSL_RNG_RANLXD2, 
+  GSL_RNG_MT19937, GSL_RNG_MT19937_1999, GSL_RNG_MT19937_1998,
+  GSL_RNG_RANLXS0, GSL_RNG_RANLXS1, GSL_RNG_RANLXS2,
+  GSL_RNG_RANLXD1, GSL_RNG_RANLXD2,
   GSL_RNG_RANLUX, GSL_RNG_RANLUX389,
-  GSL_RNG_CMRG, GSL_RNG_MRG, 
+  GSL_RNG_CMRG, GSL_RNG_MRG,
   GSL_RNG_TAUS, GSL_RNG_TAUS2, GSL_RNG_TAUS113,  GSL_RNG_GFSR4,
-  GSL_RNG_RAND, 
+  GSL_RNG_RAND,
   GSL_RNG_RANDOM_BSD, GSL_RNG_RANDOM_GLIBC2,
-  GSL_RNG_RANDOM8_GLIBC2, GSL_RNG_RANDOM32_GLIBC2, GSL_RNG_RANDOM64_GLIBC2, 
+  GSL_RNG_RANDOM8_GLIBC2, GSL_RNG_RANDOM32_GLIBC2, GSL_RNG_RANDOM64_GLIBC2,
   GSL_RNG_RANDOM128_GLIBC2, GSL_RNG_RANDOM256_GLIBC2,
-  GSL_RNG_RANDOM8_BSD, GSL_RNG_RANDOM32_BSD, GSL_RNG_RANDOM64_BSD, 
+  GSL_RNG_RANDOM8_BSD, GSL_RNG_RANDOM32_BSD, GSL_RNG_RANDOM64_BSD,
   GSL_RNG_RANDOM128_BSD, GSL_RNG_RANDOM256_BSD,
-  GSL_RNG_RANDOM_LIBC5, GSL_RNG_RANDOM8_LIBC5, GSL_RNG_RANDOM32_LIBC5, 
-  GSL_RNG_RANDOM64_LIBC5, GSL_RNG_RANDOM128_LIBC5, GSL_RNG_RANDOM256_LIBC5, 
-  GSL_RNG_RAND48, 
-  GSL_RNG_RAN0, GSL_RNG_RAN1, GSL_RNG_RAN2, GSL_RNG_RAN3, 
+  GSL_RNG_RANDOM_LIBC5, GSL_RNG_RANDOM8_LIBC5, GSL_RNG_RANDOM32_LIBC5,
+  GSL_RNG_RANDOM64_LIBC5, GSL_RNG_RANDOM128_LIBC5, GSL_RNG_RANDOM256_LIBC5,
+  GSL_RNG_RAND48,
+  GSL_RNG_RAN0, GSL_RNG_RAN1, GSL_RNG_RAN2, GSL_RNG_RAN3,
   GSL_RNG_RANF, GSL_RNG_RANMAR, GSL_RNG_R250, GSL_RNG_TT800, GSL_RNG_VAX,
   GSL_RNG_TRANSPUTER, GSL_RNG_RANDU, GSL_RNG_MINSTD,
   GSL_RNG_UNI, GSL_RNG_UNI32, GSL_RNG_SLATEC, GSL_RNG_ZUF,
@@ -70,16 +70,16 @@ static VALUE rb_gsl_rng_alloc(int argc, VALUE *argv, VALUE klass)
     T = gsl_rng_default;
     seed = gsl_rng_default_seed;
   } else {
-    T = get_gsl_rng_type(argv[0]);    
+    T = get_gsl_rng_type(argv[0]);
     if (argc == 1) {
       seed = gsl_rng_default_seed;
     } else if (argc == 2) {
       itype = TYPE(argv[1]);
       if (itype == T_FIXNUM || itype == T_BIGNUM) {
-	seed = FIX2INT(argv[1]);
+        seed = FIX2INT(argv[1]);
       } else {
-	rb_raise(rb_eArgError, 
-		 "bad argument 2, seed must be an integer.");
+        rb_raise(rb_eArgError,
+                 "bad argument 2, seed must be an integer.");
       }
     } else {
       rb_raise(rb_eArgError, "too many arguments (%d for 0 or 1)", argc);
@@ -110,7 +110,6 @@ static const gsl_rng_type* get_gsl_rng_type_name(char *name)
 {
   if (str_tail_grep(name, "default") == 0) return gsl_rng_default;
   else if (str_tail_grep(name, "mt19937") == 0) return gsl_rng_mt19937;
-#ifdef GSL_1_1_LATER
   else if (str_tail_grep(name, "borosh13") == 0) return gsl_rng_borosh13;
   else if (str_tail_grep(name, "coveyou") == 0) return gsl_rng_coveyou;
   else if (str_tail_grep(name, "fishman18") == 0) return gsl_rng_fishman18;
@@ -120,15 +119,12 @@ static const gsl_rng_type* get_gsl_rng_type_name(char *name)
   else if (str_tail_grep(name, "waterman14") == 0) return gsl_rng_waterman14;
   else if (str_tail_grep(name, "knuthran") == 0) return gsl_rng_knuthran;
   else if (str_tail_grep(name, "knuthran2") == 0) return gsl_rng_knuthran2;
-#endif
-#ifdef GSL_1_2_LATER
   else if (str_tail_grep(name, "mt19937_1999") == 0) return gsl_rng_mt19937_1999;
   else if (str_tail_grep(name, "mt19937-1999") == 0) return gsl_rng_mt19937_1999;
-  else if (str_tail_grep(name, "mt19937_1998") == 0) return gsl_rng_mt19937_1998;  
-  else if (str_tail_grep(name, "mt19937-1998") == 0) return gsl_rng_mt19937_1998;  
+  else if (str_tail_grep(name, "mt19937_1998") == 0) return gsl_rng_mt19937_1998;
+  else if (str_tail_grep(name, "mt19937-1998") == 0) return gsl_rng_mt19937_1998;
   else if (str_tail_grep(name, "taus113") == 0) return gsl_rng_taus113;
   else if (str_tail_grep(name, "taus2") == 0) return gsl_rng_taus2;
-#endif
   else if (str_tail_grep(name, "mt19937") == 0) return gsl_rng_mt19937;
   else if (str_tail_grep(name, "ranlxs0") == 0) return gsl_rng_ranlxs0;
   else if (str_tail_grep(name, "ranlxs1") == 0) return gsl_rng_ranlxs1;
@@ -147,7 +143,7 @@ static const gsl_rng_type* get_gsl_rng_type_name(char *name)
   else if (str_tail_grep(name, "random32_libc5") == 0) return gsl_rng_random32_libc5;
   else if (str_tail_grep(name, "random64_libc5") == 0) return gsl_rng_random64_libc5;
   else if (str_tail_grep(name, "random128_libc5") == 0) return gsl_rng_random128_libc5;
-  else if (str_tail_grep(name, "random256_libc5") == 0) return gsl_rng_random256_libc5;  
+  else if (str_tail_grep(name, "random256_libc5") == 0) return gsl_rng_random256_libc5;
   else if (str_tail_grep(name, "random-libc5") == 0) return gsl_rng_random_libc5;
   else if (str_tail_grep(name, "random8-libc5") == 0) return gsl_rng_random8_libc5;
   else if (str_tail_grep(name, "random32-libc5") == 0) return gsl_rng_random32_libc5;
@@ -201,18 +197,16 @@ static const gsl_rng_type* get_gsl_rng_type_name(char *name)
   else if (str_tail_grep(name, "rngextra-rng1") == 0) return rngextra_rng1;
   else if (str_tail_grep(name, "rngextra-rng2") == 0) return rngextra_rng2;
 #else
-  else if (str_tail_grep(name, "rngextra_rng1")*str_tail_grep(name, "rngextra_rng2") == 0) 
+  else if (str_tail_grep(name, "rngextra_rng1")*str_tail_grep(name, "rngextra_rng2") == 0)
     rb_raise(rb_eNotImpError, "Install the rngextra package found at <http://www.network-theory.co.uk/download/rngextra/>.");
-  else if (str_tail_grep(name, "rngextra_rng2")*str_tail_grep(name, "rngextra_rng2") == 0) 
+  else if (str_tail_grep(name, "rngextra_rng2")*str_tail_grep(name, "rngextra_rng2") == 0)
     rb_raise(rb_eNotImpError, "Install the rngextra package found at <http://www.network-theory.co.uk/download/rngextra/>.");
-  else if (str_tail_grep(name, "rngextra-rng1")*str_tail_grep(name, "rngextra_rng2") == 0) 
+  else if (str_tail_grep(name, "rngextra-rng1")*str_tail_grep(name, "rngextra_rng2") == 0)
     rb_raise(rb_eNotImpError, "Install the rngextra package found at <http://www.network-theory.co.uk/download/rngextra/>.");
-  else if (str_tail_grep(name, "rngextra-rng2")*str_tail_grep(name, "rngextra_rng2") == 0) 
+  else if (str_tail_grep(name, "rngextra-rng2")*str_tail_grep(name, "rngextra_rng2") == 0)
     rb_raise(rb_eNotImpError, "Install the rngextra package found at <http://www.network-theory.co.uk/download/rngextra/>.");
 #endif
-#ifdef GSL_1_9_LATER
   else if (str_tail_grep(name, "knuthran2002") == 0) return gsl_rng_knuthran2002;
-#endif
   else
     rb_raise(rb_eArgError, "unknown generator type \"%s\"", name);
 }
@@ -224,12 +218,10 @@ static const gsl_rng_type* get_gsl_rng_type_int(int itype)
   switch (itype) {
   case GSL_RNG_DEFAULT: T = gsl_rng_default; break;
   case GSL_RNG_MT19937: T = gsl_rng_mt19937; break; /* default */
-#ifdef GSL_1_2_LATER
   case GSL_RNG_MT19937_1999: T = gsl_rng_mt19937_1999; break;
   case GSL_RNG_MT19937_1998: T = gsl_rng_mt19937_1998; break;
   case GSL_RNG_TAUS113: T = gsl_rng_taus113; break;
   case GSL_RNG_TAUS2: T = gsl_rng_taus2; break;
-#endif
   case GSL_RNG_RANLXS0: T = gsl_rng_ranlxs0; break;
   case GSL_RNG_RANLXS1: T = gsl_rng_ranlxs1; break;
   case GSL_RNG_RANLXS2: T = gsl_rng_ranlxs2; break;
@@ -277,7 +269,6 @@ static const gsl_rng_type* get_gsl_rng_type_int(int itype)
   case GSL_RNG_UNI32: T = gsl_rng_uni32; break;
   case GSL_RNG_SLATEC: T = gsl_rng_slatec; break;
   case GSL_RNG_ZUF: T = gsl_rng_zuf; break;
-#ifdef GSL_1_1_LATER
   case GSL_RNG_BOROSH13: T = gsl_rng_borosh13; break;
   case GSL_RNG_COVEYOU: T = gsl_rng_coveyou; break;
   case GSL_RNG_FISHMAN18: T = gsl_rng_fishman18; break;
@@ -287,7 +278,6 @@ static const gsl_rng_type* get_gsl_rng_type_int(int itype)
   case GSL_RNG_KNUTHRAN2: T = gsl_rng_knuthran2; break;
   case GSL_RNG_LECUYER21: T = gsl_rng_lecuyer21; break;
   case GSL_RNG_WATERMAN14: T = gsl_rng_waterman14; break;
-#endif
 #ifdef HAVE_RNGEXTRA_RNGEXTRA_H
   case GSL_RNGEXTRA_RNG1: T = rngextra_rng1; break;
   case GSL_RNGEXTRA_RNG2: T = rngextra_rng2; break;
@@ -297,14 +287,12 @@ static const gsl_rng_type* get_gsl_rng_type_int(int itype)
     rb_raise(rb_eNotImpError, "Install the rngextra package found at <http://www.network-theory.co.uk/download/rngextra/>.");
     break;
 #endif
-#ifdef GSL_1_9_LATER
   case GSL_RNG_KNUTHRAN2002: T = gsl_rng_knuthran2002; break;
-#endif
   default:
     rb_raise(rb_eTypeError, "wrong generator type");
   }
 
-  return  T;
+  return T;
 }
 
 static void rb_gsl_rng_define_const_type(VALUE module)
@@ -404,10 +392,10 @@ static VALUE rb_gsl_rng_set(VALUE obj, VALUE s)
 
 /*
   Document-method: <i>GSL::Rng#get</i>
-    Returns a random integer from the generator. 
-    The minimum and maximum values depend on the algorithm used, 
-    but all integers in the range [min,max] are equally likely. 
-    The values of min and max can determined using the auxiliary 
+    Returns a random integer from the generator.
+    The minimum and maximum values depend on the algorithm used,
+    but all integers in the range [min,max] are equally likely.
+    The values of min and max can determined using the auxiliary
     methodss GSL::Rng#max and GSL::Rng#min.
 */
 static VALUE rb_gsl_rng_get(int argc, VALUE *argv, VALUE obj)
@@ -533,7 +521,6 @@ static VALUE rb_gsl_rng_print_state(VALUE obj)
   return obj;
 }
 
-#ifdef GSL_1_4_LATER
 static VALUE rb_gsl_rng_fwrite(VALUE obj, VALUE io)
 {
   gsl_rng *h = NULL;
@@ -557,7 +544,6 @@ static VALUE rb_gsl_rng_fread(VALUE obj, VALUE io)
   if (flag == 1) fclose(f);
   return INT2FIX(status);
 }
-#endif
 
 static VALUE rb_gsl_rng_memcpy(VALUE obj, VALUE dst, VALUE org)
 {
@@ -574,7 +560,7 @@ void Init_gsl_rng(VALUE module)
   cgsl_rng = rb_define_class_under(module, "Rng", cGSL_Object);
 
   rb_gsl_rng_define_const_type(module);
-  
+
   rb_define_singleton_method(cgsl_rng, "alloc", rb_gsl_rng_alloc, -1);
 
   rb_define_singleton_method(cgsl_rng, "default_seed", rb_gsl_rng_default_seed, 0);
@@ -603,9 +589,7 @@ void Init_gsl_rng(VALUE module)
   rb_define_alias(cgsl_rng, "duplicate", "clone");
   rb_define_method(cgsl_rng, "print_state", rb_gsl_rng_print_state, 0);
 
-#ifdef GSL_1_4_LATER
   rb_define_method(cgsl_rng, "fwrite", rb_gsl_rng_fwrite, 1);
   rb_define_method(cgsl_rng, "fread", rb_gsl_rng_fread, 1);
-#endif
   rb_define_singleton_method(cgsl_rng, "memcpy", rb_gsl_rng_memcpy, 2);
 }

data/ext/{gsl → gsl_native}/root.c

@@ -2,7 +2,7 @@
   root.c
   Ruby/GSL: Ruby extension library for GSL (GNU Scientific Library)
   (C) Copyright 2004 by Yoshiki Tsunesada
-  
+
   Ruby/GSL is free software: you can redistribute it and/or modify it
   under the terms of the GNU General Public License.
   This library is distributed in the hope that it will be useful, but
@@ -42,8 +42,8 @@ static VALUE rb_gsl_fsolver_new(VALUE klass, VALUE t)
     } else if (!str_tail_grep(name, "brent")) {
       T = gsl_root_fsolver_brent;
     } else {
-      rb_raise(rb_eTypeError, 
-	       "type must be \"bisection\" or \"falsepos\", or \"brent\".");
+      rb_raise(rb_eTypeError,
+               "type must be \"bisection\" or \"falsepos\", or \"brent\".");
     }
     break;
   case T_FIXNUM:
@@ -64,7 +64,7 @@ static VALUE rb_gsl_fsolver_new(VALUE klass, VALUE t)
     break;
   default:
     rb_raise(rb_eTypeError, "wrong argument type %s (String or Fixnum expected)",
-	     rb_class2name(CLASS_OF(t)));
+             rb_class2name(CLASS_OF(t)));
     break;
   }
   s = gsl_root_fsolver_alloc(T);
@@ -124,28 +124,28 @@ static VALUE rb_gsl_fsolver_name(VALUE obj)
 static VALUE rb_gsl_fsolver_test_interval(VALUE obj, VALUE eabs, VALUE erel)
 {
   gsl_root_fsolver *s = NULL;
-  Need_Float(eabs); Need_Float(erel); 
+  Need_Float(eabs); Need_Float(erel);
   Data_Get_Struct(obj, gsl_root_fsolver, s);
   return INT2FIX(gsl_root_test_interval(s->x_lower, s->x_upper,
-					NUM2DBL(eabs), NUM2DBL(erel)));
+                                        NUM2DBL(eabs), NUM2DBL(erel)));
 }
 
 static VALUE rb_gsl_root_test_interval(VALUE obj, VALUE xl, VALUE xu, VALUE eabs,
-				       VALUE erel)
+                                       VALUE erel)
 {
   Need_Float(xl); Need_Float(xu);
-  Need_Float(eabs); Need_Float(erel); 
+  Need_Float(eabs); Need_Float(erel);
   return INT2FIX(gsl_root_test_interval(NUM2DBL(xl), NUM2DBL(xu),
-					NUM2DBL(eabs), NUM2DBL(erel)));
+                                        NUM2DBL(eabs), NUM2DBL(erel)));
 }
 
 static VALUE rb_gsl_root_test_delta(VALUE obj, VALUE xl, VALUE xu, VALUE eabs,
-				       VALUE erel)
+                                    VALUE erel)
 {
   Need_Float(xl); Need_Float(xu);
-  Need_Float(eabs); Need_Float(erel); 
+  Need_Float(eabs); Need_Float(erel);
   return INT2FIX(gsl_root_test_delta(NUM2DBL(xl), NUM2DBL(xu),
-				     NUM2DBL(eabs), NUM2DBL(erel)));
+                                     NUM2DBL(eabs), NUM2DBL(erel)));
 }
 
 static VALUE rb_gsl_root_test_residual(VALUE obj, VALUE xl,VALUE eabs)
@@ -154,7 +154,7 @@ static VALUE rb_gsl_root_test_residual(VALUE obj, VALUE xl,VALUE eabs)
   return INT2FIX(gsl_root_test_residual(NUM2DBL(xl),  NUM2DBL(eabs)));
 }
 
-static VALUE rb_gsl_fsolver_solve(int argc, VALUE *argv, VALUE *obj)
+static VALUE rb_gsl_fsolver_solve(int argc, VALUE *argv, VALUE obj)
 {
   gsl_root_fsolver *s = NULL;
   gsl_function *F = NULL;
@@ -165,15 +165,15 @@ static VALUE rb_gsl_fsolver_solve(int argc, VALUE *argv, VALUE *obj)
     Check_Type(argv[2], T_ARRAY);
     epsabs = NUM2DBL(rb_ary_entry(argv[2], 0));
     epsrel = NUM2DBL(rb_ary_entry(argv[2], 1));
-    /* no break */
+  /* no break */
   case 2:
     Check_Type(argv[1], T_ARRAY);
     xl = NUM2DBL(rb_ary_entry(argv[1], 0));
     xh = NUM2DBL(rb_ary_entry(argv[1], 1));
     break;
   default:
-    rb_raise(rb_eArgError, 
-	     "Usage: solve(f = Function, range = Array, eps = Array)");
+    rb_raise(rb_eArgError,
+             "Usage: solve(f = Function, range = Array, eps = Array)");
     break;
   }
   CHECK_FUNCTION(argv[0]);
@@ -228,7 +228,7 @@ static VALUE rb_gsl_fdfsolver_new(VALUE klass, VALUE t)
     break;
   default:
     rb_raise(rb_eTypeError, "wrong argument type %s (String or Fixnum expected)",
-	     rb_class2name(CLASS_OF(t)));
+             rb_class2name(CLASS_OF(t)));
     break;
   }
   s = gsl_root_fdfsolver_alloc(T);
@@ -269,7 +269,7 @@ static VALUE rb_gsl_fdfsolver_name(VALUE obj)
   return rb_str_new2(gsl_root_fdfsolver_name(s));
 }
 
-static VALUE rb_gsl_fdfsolver_solve(int argc, VALUE *argv, VALUE *obj)
+static VALUE rb_gsl_fdfsolver_solve(int argc, VALUE *argv, VALUE obj)
 {
   gsl_root_fdfsolver *s = NULL;
   double x = 0.0, x0, epsabs = 0.0, epsrel = 1e-6;
@@ -280,7 +280,7 @@ static VALUE rb_gsl_fdfsolver_solve(int argc, VALUE *argv, VALUE *obj)
     Check_Type(argv[2], T_ARRAY);
     epsabs = NUM2DBL(rb_ary_entry(argv[2], 0));
     epsrel = NUM2DBL(rb_ary_entry(argv[2], 1));
-    /* no break */
+  /* no break */
   case 2:
     Need_Float(argv[1]);
     x0 = NUM2DBL(argv[1]);
@@ -292,7 +292,7 @@ static VALUE rb_gsl_fdfsolver_solve(int argc, VALUE *argv, VALUE *obj)
   CHECK_FUNCTION_FDF(argv[0]);
   Data_Get_Struct(argv[0], gsl_function_fdf, F);
   Data_Get_Struct(obj, gsl_root_fdfsolver, s);
-  gsl_root_fdfsolver_set(s, F, x0);  
+  gsl_root_fdfsolver_set(s, F, x0);
   do {
     iter++;
     status = gsl_root_fdfsolver_iterate (s);
@@ -361,32 +361,32 @@ void Init_gsl_root(VALUE module)
   mgsl_root = rb_define_module_under(module, "Root");
 
   cgsl_fsolver = rb_define_class_under(mgsl_root, "FSolver", cGSL_Object);
-  rb_define_singleton_method(cgsl_fsolver, "alloc", rb_gsl_fsolver_new, 1);  
-
-  rb_define_method(cgsl_fsolver, "set", rb_gsl_fsolver_set, 3);  
-  rb_define_method(cgsl_fsolver, "iterate", rb_gsl_fsolver_iterate, 0);  
-  rb_define_method(cgsl_fsolver, "root", rb_gsl_fsolver_root, 0);  
-  rb_define_method(cgsl_fsolver, "name", rb_gsl_fsolver_name, 0);  
-  rb_define_method(cgsl_fsolver, "x_lower", rb_gsl_fsolver_x_lower, 0);  
-  rb_define_method(cgsl_fsolver, "x_upper", rb_gsl_fsolver_x_upper, 0);  
-  rb_define_method(cgsl_fsolver, "test_interval", rb_gsl_fsolver_test_interval, 2);  
-  rb_define_method(cgsl_fsolver, "solve", rb_gsl_fsolver_solve, -1);  
-
-  rb_define_singleton_method(mgsl_root, "test_interval", 
-			    rb_gsl_root_test_interval, 4);
-  rb_define_singleton_method(mgsl_root, "test_delta", 
-			    rb_gsl_root_test_delta, 4);
-  rb_define_singleton_method(mgsl_root, "test_residual", 
-			    rb_gsl_root_test_residual, 2);
+  rb_define_singleton_method(cgsl_fsolver, "alloc", rb_gsl_fsolver_new, 1);
+
+  rb_define_method(cgsl_fsolver, "set", rb_gsl_fsolver_set, 3);
+  rb_define_method(cgsl_fsolver, "iterate", rb_gsl_fsolver_iterate, 0);
+  rb_define_method(cgsl_fsolver, "root", rb_gsl_fsolver_root, 0);
+  rb_define_method(cgsl_fsolver, "name", rb_gsl_fsolver_name, 0);
+  rb_define_method(cgsl_fsolver, "x_lower", rb_gsl_fsolver_x_lower, 0);
+  rb_define_method(cgsl_fsolver, "x_upper", rb_gsl_fsolver_x_upper, 0);
+  rb_define_method(cgsl_fsolver, "test_interval", rb_gsl_fsolver_test_interval, 2);
+  rb_define_method(cgsl_fsolver, "solve", rb_gsl_fsolver_solve, -1);
+
+  rb_define_singleton_method(mgsl_root, "test_interval",
+                             rb_gsl_root_test_interval, 4);
+  rb_define_singleton_method(mgsl_root, "test_delta",
+                             rb_gsl_root_test_delta, 4);
+  rb_define_singleton_method(mgsl_root, "test_residual",
+                             rb_gsl_root_test_residual, 2);
 
   cgsl_fdfsolver = rb_define_class_under(mgsl_root, "FdfSolver", cGSL_Object);
-  rb_define_singleton_method(cgsl_fdfsolver, "alloc", rb_gsl_fdfsolver_new, 1);  
+  rb_define_singleton_method(cgsl_fdfsolver, "alloc", rb_gsl_fdfsolver_new, 1);
 
-  rb_define_method(cgsl_fdfsolver, "set", rb_gsl_fdfsolver_set, 2);  
-  rb_define_method(cgsl_fdfsolver, "iterate", rb_gsl_fdfsolver_iterate, 0);  
-  rb_define_method(cgsl_fdfsolver, "root", rb_gsl_fdfsolver_root, 0);  
-  rb_define_method(cgsl_fdfsolver, "name", rb_gsl_fdfsolver_name, 0);  
-  rb_define_method(cgsl_fdfsolver, "solve", rb_gsl_fdfsolver_solve, -1);  
+  rb_define_method(cgsl_fdfsolver, "set", rb_gsl_fdfsolver_set, 2);
+  rb_define_method(cgsl_fdfsolver, "iterate", rb_gsl_fdfsolver_iterate, 0);
+  rb_define_method(cgsl_fdfsolver, "root", rb_gsl_fdfsolver_root, 0);
+  rb_define_method(cgsl_fdfsolver, "name", rb_gsl_fdfsolver_name, 0);
+  rb_define_method(cgsl_fdfsolver, "solve", rb_gsl_fdfsolver_solve, -1);
 
   rb_define_method(cgsl_function, "fsolve", rb_gsl_function_rootfinder, -1);
   rb_define_alias(cgsl_function, "solve", "fsolve");

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

@@ -12,9 +12,6 @@
 
 #include "include/rb_gsl_array.h"
 #include "include/rb_gsl_sf.h"
-#ifdef HAVE_NARRAY_H
-#include "narray.h"
-#endif
 
 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);
     }
@@ -777,10 +756,6 @@ VALUE rb_gsl_sf_eval_double_m(double (*func)(double, gsl_mode_t), VALUE argv, VA
   double val;
   /*gsl_mode_t mode;
   char c;*/
-#ifdef HAVE_NARRAY_H
-  double *ptr1, *ptr2;
-  struct NARRAY *na;
-#endif
   switch (TYPE(m)) {
   case T_STRING:
     /*c = tolower(NUM2CHR(m));
@@ -794,7 +769,7 @@ VALUE rb_gsl_sf_eval_double_m(double (*func)(double, gsl_mode_t), VALUE argv, VA
     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,8 +828,8 @@ 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;
@@ -861,10 +838,6 @@ VALUE rb_gsl_sf_eval_double2_m(double (*func)(double, double, gsl_mode_t),
   double val, xx2;
   /*gsl_mode_t mode;
   char c;*/
-#ifdef HAVE_NARRAY_H
-  double *ptr1, *ptr2;
-  struct NARRAY *na;
-#endif
   Need_Float(x2);
   xx2 = NUM2DBL(x2);
   /*c = tolower(NUM2CHR(m));
@@ -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,8 +902,8 @@ 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;
@@ -937,10 +912,6 @@ VALUE rb_gsl_sf_eval_double3_m(double (*func)(double, double, double, gsl_mode_t
   double val, xx2, xx3;
   /*gsl_mode_t mode;
   char c;*/
-#ifdef HAVE_NARRAY_H
-  double *ptr1, *ptr2;
-  struct NARRAY *na;
-#endif
   Need_Float(x2); Need_Float(x3);
   xx2 = NUM2DBL(x2);
   xx3 = NUM2DBL(x3);
@@ -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,8 +978,8 @@ 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;
@@ -1015,10 +988,6 @@ VALUE rb_gsl_sf_eval_double4_m(double (*func)(double, double, double, double,
   double val, xx2, xx3, xx4;
   /*gsl_mode_t mode;
   char c;*/
-#ifdef HAVE_NARRAY_H
-  double *ptr1, *ptr2;
-  struct NARRAY *na;
-#endif
   Need_Float(x2); Need_Float(x3); Need_Float(x4);
   xx2 = NUM2DBL(x2);  xx3 = NUM2DBL(x3); xx4 = NUM2DBL(x4);
   /*c = tolower(NUM2CHR(m));
@@ -1032,7 +1001,7 @@ VALUE rb_gsl_sf_eval_double4_m(double (*func)(double, double, double, double,
   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);
     }
@@ -1111,8 +1082,8 @@ VALUE rb_gsl_sf_eval_e_uint(int (*func)(unsigned int, gsl_sf_result*), VALUE x)
   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;
@@ -1122,8 +1093,8 @@ VALUE rb_gsl_sf_eval_e_int_uint(int (*func)(int, unsigned int, gsl_sf_result*),
   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;
@@ -1133,8 +1104,8 @@ VALUE rb_gsl_sf_eval_e_double_uint(int (*func)(double, unsigned int, gsl_sf_resu
   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;
@@ -1145,8 +1116,8 @@ VALUE rb_gsl_sf_eval_e_int_double(int (*func)(int, double, gsl_sf_result*),
   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;
@@ -1158,8 +1129,8 @@ VALUE rb_gsl_sf_eval_e_int_double2(int (*func)(int, double, double, gsl_sf_resul
 }
 
 
-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;
@@ -1170,20 +1141,20 @@ VALUE rb_gsl_sf_eval_e_int_int_double(int (*func)(int, int, double, gsl_sf_resul
   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;
-  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);
   (*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;
@@ -1193,8 +1164,8 @@ VALUE rb_gsl_sf_eval_e_double3(int (*func)(double, double, double, gsl_sf_result
   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;
@@ -1214,7 +1185,7 @@ 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);
@@ -1223,8 +1194,8 @@ VALUE rb_gsl_sf_eval_e_m(int (*func)(double, gsl_mode_t, gsl_sf_result*),
 }
 
 
-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;
@@ -1244,7 +1215,7 @@ 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);
@@ -1252,8 +1223,8 @@ VALUE rb_gsl_sf_eval_e_double2_m(int (*func)(double, double, gsl_mode_t, gsl_sf_
   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;
@@ -1273,7 +1244,7 @@ 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);
@@ -1282,8 +1253,8 @@ VALUE rb_gsl_sf_eval_e_double3_m(int (*func)(double, double, double, gsl_mode_t,
 }
 
 
-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;
@@ -1303,9 +1274,9 @@ 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);
   (*func)(NUM2DBL(x1), NUM2DBL(x2),NUM2DBL(x3), NUM2DBL(x4), mode, rslt);
   return v;
@@ -1319,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:
@@ -1343,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;
@@ -1356,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 {
@@ -1368,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);
     }
@@ -1404,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)));
   }
 }
 
@@ -1424,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);
@@ -1435,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);
@@ -1473,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);
 }