rb-gsl 1.16.0.4 → 1.16.0.5

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

@@ -19,8 +19,8 @@ static VALUE rb_gsl_sf_elljac_e(VALUE obj, VALUE n, VALUE m)
   //int status;
   Need_Float(n); Need_Float(m);
   /*status =*/ gsl_sf_elljac_e(NUM2DBL(n), NUM2DBL(m), &sn, &cn, &dn);
-  return rb_ary_new3(3, rb_float_new(sn), 
-		     rb_float_new(cn), rb_float_new(dn));
+  return rb_ary_new3(3, rb_float_new(sn),
+                     rb_float_new(cn), rb_float_new(dn));
 }
 
 void Init_gsl_sf_elljac(VALUE module)

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

@@ -62,7 +62,6 @@ static VALUE rb_gsl_sf_erf_Q_e(VALUE obj, VALUE x)
   return rb_gsl_sf_eval_e(gsl_sf_erf_Q_e, x);
 }
 
-#ifdef GSL_1_4_LATER
 static VALUE rb_gsl_sf_hazard(VALUE obj, VALUE x)
 {
   return rb_gsl_sf_eval1(gsl_sf_hazard, x);
@@ -72,7 +71,6 @@ static VALUE rb_gsl_sf_hazard_e(VALUE obj, VALUE x)
 {
   return rb_gsl_sf_eval_e(gsl_sf_hazard_e, x);
 }
-#endif
 
 void Init_gsl_sf_erfc(VALUE module)
 {
@@ -86,8 +84,6 @@ void Init_gsl_sf_erfc(VALUE module)
   rb_define_module_function(module, "erf_Z_e",  rb_gsl_sf_erf_Z_e, 1);
   rb_define_module_function(module, "erf_Q",  rb_gsl_sf_erf_Q, 1);
   rb_define_module_function(module, "erf_Q_e",  rb_gsl_sf_erf_Q_e, 1);
-#ifdef GSL_1_4_LATER
   rb_define_module_function(module, "hazard",  rb_gsl_sf_hazard, 1);
   rb_define_module_function(module, "hazard_e",  rb_gsl_sf_hazard_e, 1);
-#endif
 }

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

@@ -119,7 +119,7 @@ static VALUE rb_gsl_sf_exp_err_e10_e(VALUE obj, VALUE x, VALUE dx)
 }
 
 static VALUE rb_gsl_sf_exp_mult_err_e(VALUE obj, VALUE x, VALUE dx,
-				      VALUE y, VALUE dy)
+                                      VALUE y, VALUE dy)
 {
   gsl_sf_result *rslt = NULL;
   VALUE v;
@@ -133,7 +133,7 @@ static VALUE rb_gsl_sf_exp_mult_err_e(VALUE obj, VALUE x, VALUE dx,
 }
 
 static VALUE rb_gsl_sf_exp_mult_err_e10_e(VALUE obj, VALUE x, VALUE dx,
-					  VALUE y, VALUE dy)
+                                          VALUE y, VALUE dy)
 {
   gsl_sf_result_e10 *rslt = NULL;
   VALUE v;

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

@@ -102,7 +102,6 @@ static VALUE rb_gsl_sf_atanint_e(VALUE obj, VALUE x)
   return rb_gsl_sf_eval_e(gsl_sf_atanint_e, x);
 }
 
-#ifdef GSL_1_3_LATER
 static VALUE rb_gsl_sf_expint_E1_scaled(VALUE obj, VALUE x)
 {
   return rb_gsl_sf_eval1(gsl_sf_expint_E1_scaled, x);
@@ -132,9 +131,7 @@ static VALUE rb_gsl_sf_expint_Ei_scaled_e(VALUE obj, VALUE x)
 {
   return rb_gsl_sf_eval_e(gsl_sf_expint_Ei_scaled_e, x);
 }
-#endif
 
-#ifdef GSL_1_10_LATER
 static VALUE rb_gsl_sf_expint_En(VALUE obj, VALUE n, VALUE x)
 {
   return rb_gsl_sf_eval_int_double(gsl_sf_expint_En, n, x);
@@ -148,8 +145,6 @@ static VALUE rb_gsl_sf_expint_En_e(VALUE obj, VALUE n, VALUE x)
   return val;
 }
 
-#endif
-
 void Init_gsl_sf_expint(VALUE module)
 {
   VALUE mgsl_sf_expint;
@@ -185,7 +180,6 @@ void Init_gsl_sf_expint(VALUE module)
   rb_define_module_function(mgsl_sf_expint, "three",  rb_gsl_sf_expint_3, 1);
   rb_define_module_function(mgsl_sf_expint, "three_e",  rb_gsl_sf_expint_3_e, 1);
 
-#ifdef GSL_1_3_LATER
   rb_define_module_function(module, "expint_E1_scaled",  rb_gsl_sf_expint_E1_scaled, 1);
   rb_define_module_function(module, "expint_E1_scaled_e",  rb_gsl_sf_expint_E1_scaled_e, 1);
   rb_define_module_function(module, "expint_E2_scaled",  rb_gsl_sf_expint_E2_scaled, 1);
@@ -199,13 +193,9 @@ void Init_gsl_sf_expint(VALUE module)
   rb_define_module_function(mgsl_sf_expint, "E2_scaled_e",  rb_gsl_sf_expint_E2_scaled_e, 1);
   rb_define_module_function(mgsl_sf_expint, "Ei_scaled",  rb_gsl_sf_expint_Ei_scaled, 1);
   rb_define_module_function(mgsl_sf_expint, "Ei_scaled_e",  rb_gsl_sf_expint_Ei_scaled_e, 1);
-#endif
 
-#ifdef GSL_1_10_LATER
   rb_define_module_function(module, "expint_En",  rb_gsl_sf_expint_En, 2);
   rb_define_module_function(mgsl_sf_expint, "En",  rb_gsl_sf_expint_En, 2);
   rb_define_module_function(module, "expint_En_e",  rb_gsl_sf_expint_En_e, 2);
-  rb_define_module_function(mgsl_sf_expint, "En_e",  rb_gsl_sf_expint_En_e, 2);  
-#endif
-
+  rb_define_module_function(mgsl_sf_expint, "En_e",  rb_gsl_sf_expint_En_e, 2);
 }

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

@@ -242,12 +242,10 @@ static VALUE rb_gsl_sf_gamma_inc(VALUE obj, VALUE a, VALUE x)
   return rb_gsl_sf_eval_double_double(gsl_sf_gamma_inc_P, a, x);
 }
 
-#ifdef GSL_1_4_LATER
 static VALUE rb_gsl_sf_gamma_inc_e(VALUE obj, VALUE a, VALUE x)
 {
   return rb_gsl_sf_eval_e_double2(gsl_sf_gamma_inc_e, a, x);
 }
-#endif
 
 static VALUE rb_gsl_sf_beta(VALUE obj, VALUE a, VALUE b)
 {
@@ -284,7 +282,7 @@ static VALUE rb_gsl_sf_beta_inc_e(VALUE obj, VALUE a, VALUE b, VALUE x)
 double mygsl_binomial_coef(unsigned int n, unsigned int k);
 double mygsl_binomial_coef(unsigned int n, unsigned int k)
 {
-  return floor(0.5 + exp(gsl_sf_lnfact(n) - gsl_sf_lnfact(k) - gsl_sf_lnfact(n-k))); 
+  return floor(0.5 + exp(gsl_sf_lnfact(n) - gsl_sf_lnfact(k) - gsl_sf_lnfact(n-k)));
 }
 
 static VALUE rb_gsl_sf_bincoef(VALUE obj, VALUE n, VALUE k)
@@ -333,9 +331,7 @@ void Init_gsl_sf_gamma(VALUE module)
   rb_define_module_function(module, "gamma_inc_Q_e",  rb_gsl_sf_gamma_inc_Q_e, 2);
   rb_define_module_function(module, "gamma_inc",  rb_gsl_sf_gamma_inc, 2);
 
-#ifdef GSL_1_4_LATER
   rb_define_module_function(module, "gamma_inc_e",  rb_gsl_sf_gamma_inc_e, 2);
-#endif
   rb_define_module_function(module, "beta",  rb_gsl_sf_beta, 2);
   rb_define_module_function(module, "beta_e",  rb_gsl_sf_beta_e, 2);
   rb_define_module_function(module, "lnbeta",  rb_gsl_sf_lnbeta, 2);

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

@@ -12,7 +12,7 @@
 #include "include/rb_gsl_sf.h"
 
 static VALUE rb_gsl_sf_laguerre_X(int argc, VALUE *argv, VALUE obj,
-				  double (*f)(double, double))
+                                  double (*f)(double, double))
 {
   switch (argc) {
   case 2:
@@ -62,11 +62,11 @@ static VALUE rb_gsl_sf_laguerre_n(int argc, VALUE *argv, VALUE obj)
   switch (argc) {
   case 3:
     return rb_gsl_sf_eval_int_double_double(gsl_sf_laguerre_n, argv[0],
-					    argv[1], argv[2]);
+                                            argv[1], argv[2]);
     break;
   case 2:
     return rb_gsl_sf_eval_int_double_double(gsl_sf_laguerre_n, argv[0],
-					    INT2FIX(0), argv[1]);
+                                            INT2FIX(0), argv[1]);
     break;
   default:
     rb_raise(rb_eArgError, "wrong number of arguments (%d for 1 or 2)", argc);

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

@@ -13,14 +13,14 @@
 
 static VALUE rb_gsl_sf_log(VALUE obj, VALUE x)
 {
-  if (COMPLEX_P(x) || VECTOR_COMPLEX_P(x) || MATRIX_COMPLEX_P(x)) 
+  if (COMPLEX_P(x) || VECTOR_COMPLEX_P(x) || MATRIX_COMPLEX_P(x))
     return rb_gsl_math_complex_eval(gsl_complex_log, x);
   return rb_gsl_sf_eval1(gsl_sf_log, x);
 }
 
 static VALUE rb_gsl_sf_log10(VALUE obj, VALUE x)
 {
-  if (COMPLEX_P(x) || VECTOR_COMPLEX_P(x) || MATRIX_COMPLEX_P(x)) 
+  if (COMPLEX_P(x) || VECTOR_COMPLEX_P(x) || MATRIX_COMPLEX_P(x))
     return rb_gsl_math_complex_eval(gsl_complex_log10, x);
   return rb_gsl_sf_eval1(log10, x);
 }
@@ -93,7 +93,7 @@ static VALUE rb_gsl_sf_log_1plusx_mx_e(VALUE obj, VALUE x)
 void Init_gsl_sf_log(VALUE module)
 {
   rb_define_module_function(module, "log",  rb_gsl_sf_log, 1);
-  rb_define_module_function(module, "log10",  rb_gsl_sf_log10, 1);  
+  rb_define_module_function(module, "log10",  rb_gsl_sf_log10, 1);
   rb_define_module_function(module, "log_e",  rb_gsl_sf_log_e, 1);
   rb_define_module_function(module, "log_abs",  rb_gsl_sf_log_abs, 1);
   rb_define_module_function(module, "log_abs_e",  rb_gsl_sf_log_abs_e, 1);

data/ext/gsl_native/sf_mathieu.c

@@ -0,0 +1,235 @@
+#include "include/rb_gsl.h"
+
+static VALUE cWorkspace;
+
+static VALUE rb_gsl_sf_mathieu_alloc(VALUE klass, VALUE n, VALUE q)
+{
+  gsl_sf_mathieu_workspace *w;
+  w = gsl_sf_mathieu_alloc((size_t) FIX2INT(n), NUM2DBL(q));
+  return Data_Wrap_Struct(klass, 0, gsl_sf_mathieu_free, w);
+}
+
+static VALUE sf_mathieu_eval(VALUE order, VALUE qq,
+                             int (*f)(int, double, gsl_sf_result*))
+{
+  gsl_sf_result r;
+  (*f)(FIX2INT(order), NUM2DBL(qq), &r);
+  return rb_float_new(r.val);
+}
+
+static VALUE sf_mathieu_eval2(VALUE n1, VALUE n2, VALUE q, VALUE x,
+                              int (*f)(int, int, double, double, gsl_sf_result*))
+{
+  gsl_sf_result r;
+  (*f)(FIX2INT(n1),FIX2INT(n2),  NUM2DBL(q), NUM2DBL(x), &r);
+  return rb_float_new(r.val);
+}
+
+static VALUE sf_mathieu_array_eval(int argc, VALUE *argv,
+                                   int (*f)(int, int, double, gsl_sf_mathieu_workspace*, double[]))
+{
+  gsl_sf_mathieu_workspace *w;
+  gsl_vector *v;
+  int n1, n2;
+  double q;
+  switch (argc) {
+  case 4:
+    if (!rb_obj_is_kind_of(argv[3], cWorkspace)) {
+      rb_raise(rb_eTypeError, "Wrong argument type 3 (%s detected, %s expected)",
+               rb_class2name(CLASS_OF(argv[3])), rb_class2name(cWorkspace));
+    }
+    n1 = FIX2INT(argv[0]);
+    n2 = FIX2INT(argv[1]);
+    q = NUM2DBL(argv[2]);
+    Data_Get_Struct(argv[3], gsl_sf_mathieu_workspace, w);
+    break;
+  default:
+    rb_raise(rb_eArgError, "Wrong number of arguments. (%d for 4)", argc);
+  }
+  v = gsl_vector_alloc(n2 - n1 + 1);
+  (*f)(n1, n2, q, w, v->data);
+  return Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, v);
+}
+
+static VALUE sf_mathieu_array_eval2(int argc, VALUE *argv,
+                                    int (*f)(int, int,  double, double, gsl_sf_mathieu_workspace*, double[]))
+{
+  gsl_sf_mathieu_workspace *w;
+  gsl_vector *v;
+  int n1, n2;
+  double q, x;
+  switch (argc) {
+  case 5:
+    if (!rb_obj_is_kind_of(argv[4], cWorkspace)) {
+      rb_raise(rb_eTypeError, "Wrong argument type 4 (%s detected, %s expected)",
+               rb_class2name(CLASS_OF(argv[4])), rb_class2name(cWorkspace));
+    }
+    n1 = FIX2INT(argv[0]);
+    n2 = FIX2INT(argv[1]);
+    q = NUM2DBL(argv[2]);
+    x = NUM2DBL(argv[3]);
+    Data_Get_Struct(argv[4], gsl_sf_mathieu_workspace, w);
+    break;
+  default:
+    rb_raise(rb_eArgError, "Wrong number of arguments. (%d for 5)", argc);
+  }
+  v = gsl_vector_alloc(n2 - n1 + 1);
+  (*f)(n1, n2, q, x, w, v->data);
+  return Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, v);
+}
+static VALUE sf_mathieu_array_eval3(int argc, VALUE *argv,
+                                    int (*f)(int, int, int, double, double, gsl_sf_mathieu_workspace*, double[]))
+{
+  gsl_sf_mathieu_workspace *w;
+  gsl_vector *v;
+  int n1, n2, n3;
+  double q, x;
+  switch (argc) {
+  case 6:
+    if (!rb_obj_is_kind_of(argv[5], cWorkspace)) {
+      rb_raise(rb_eTypeError, "Wrong argument type 5 (%s detected, %s expected)",
+               rb_class2name(CLASS_OF(argv[5])), rb_class2name(cWorkspace));
+    }
+    n1 = FIX2INT(argv[0]);
+    n2 = FIX2INT(argv[1]);
+    n3 = FIX2INT(argv[2]);
+    q = NUM2DBL(argv[3]);
+    x = NUM2DBL(argv[4]);
+    Data_Get_Struct(argv[5], gsl_sf_mathieu_workspace, w);
+    break;
+  default:
+    rb_raise(rb_eArgError, "Wrong number of arguments. (%d for 6)", argc);
+  }
+  v = gsl_vector_alloc(n3 - n2 + 1);
+  (*f)(n1, n2, n3, q, x, w, v->data);
+  return Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, v);
+}
+static VALUE sf_mathieu_eval_int_double2(VALUE order, VALUE qq, VALUE zz,
+                                         int (*f)(int, double, double, gsl_sf_result*))
+{
+  gsl_sf_result r;
+  (*f)(FIX2INT(order), NUM2DBL(qq), NUM2DBL(zz), &r);
+  return rb_float_new(r.val);
+}
+static VALUE sf_mathieu_eval_e_int_double2(VALUE order, VALUE qq, VALUE zz,
+                                           int (*f)(int, double, double, gsl_sf_result*))
+{
+  gsl_sf_result *r;
+  VALUE val;
+  val = Data_Make_Struct(cgsl_sf_result, gsl_sf_result, 0, free, r);
+  (*f)(FIX2INT(order), NUM2DBL(qq), NUM2DBL(zz), r);
+  return val;
+}
+
+static VALUE sf_mathieu_eval_e_int2_double2(VALUE n1, VALUE n2, VALUE qq, VALUE zz,
+                                            int (*f)(int, int, double, double, gsl_sf_result*))
+{
+  gsl_sf_result *r;
+  VALUE val;
+  val = Data_Make_Struct(cgsl_sf_result, gsl_sf_result, 0, free, r);
+  (*f)(FIX2INT(n1), FIX2INT(n2), NUM2DBL(qq), NUM2DBL(zz), r);
+  return val;
+}
+/**********/
+static VALUE rb_gsl_sf_mathieu_a_e(VALUE module, VALUE order, VALUE qq)
+{
+  return rb_gsl_sf_eval_e_int_double(gsl_sf_mathieu_a, order, qq);
+}
+static VALUE rb_gsl_sf_mathieu_a(VALUE module, VALUE order, VALUE qq)
+{
+  return sf_mathieu_eval(order, qq, gsl_sf_mathieu_a);
+}
+static VALUE rb_gsl_sf_mathieu_a_array(VALUE module, int argc, VALUE *argv)
+{
+  return sf_mathieu_array_eval(argc, argv, gsl_sf_mathieu_a_array);
+}
+static VALUE rb_gsl_sf_mathieu_b_e(VALUE module, VALUE order, VALUE qq)
+{
+  return rb_gsl_sf_eval_e_int_double(gsl_sf_mathieu_b, order, qq);
+}
+static VALUE rb_gsl_sf_mathieu_b(VALUE module, VALUE order, VALUE qq)
+{
+  return sf_mathieu_eval(order, qq, gsl_sf_mathieu_b);
+}
+static VALUE rb_gsl_sf_mathieu_b_array(VALUE module, int argc, VALUE *argv)
+{
+  return sf_mathieu_array_eval(argc, argv, gsl_sf_mathieu_b_array);
+}
+static VALUE rb_gsl_sf_mathieu_ce_e(VALUE module, VALUE order, VALUE qq, VALUE zz)
+{
+  return sf_mathieu_eval_e_int_double2(order, qq, zz, gsl_sf_mathieu_ce);
+}
+static VALUE rb_gsl_sf_mathieu_ce(VALUE module, VALUE order, VALUE qq, VALUE zz)
+{
+  return sf_mathieu_eval_int_double2(order, qq, zz, gsl_sf_mathieu_ce);
+}
+static VALUE rb_gsl_sf_mathieu_ce_array(VALUE module, int argc, VALUE *argv)
+{
+  return sf_mathieu_array_eval2(argc, argv, gsl_sf_mathieu_ce_array);
+}
+static VALUE rb_gsl_sf_mathieu_se_e(VALUE module, VALUE order, VALUE qq, VALUE zz)
+{
+  return sf_mathieu_eval_e_int_double2(order, qq, zz, gsl_sf_mathieu_se);
+}
+static VALUE rb_gsl_sf_mathieu_se(VALUE module, VALUE order, VALUE qq, VALUE zz)
+{
+  return sf_mathieu_eval_int_double2(order, qq, zz, gsl_sf_mathieu_se);
+}
+static VALUE rb_gsl_sf_mathieu_se_array(VALUE module, int argc, VALUE *argv)
+{
+  return sf_mathieu_array_eval2(argc, argv, gsl_sf_mathieu_se_array);
+}
+
+/*****/
+static VALUE rb_gsl_sf_mathieu_Mc_e(VALUE module, VALUE n1, VALUE n2, VALUE q, VALUE x)
+{
+  return sf_mathieu_eval_e_int2_double2(n1, n2, q, x, gsl_sf_mathieu_Mc);
+}
+static VALUE rb_gsl_sf_mathieu_Mc(VALUE module, VALUE n1, VALUE n2, VALUE q, VALUE x)
+{
+  return sf_mathieu_eval2(n1, n2, q, x, gsl_sf_mathieu_Mc);
+}
+static VALUE rb_gsl_sf_mathieu_Mc_array(VALUE module, int argc, VALUE *argv)
+{
+  return sf_mathieu_array_eval3(argc, argv, gsl_sf_mathieu_Mc_array);
+}
+static VALUE rb_gsl_sf_mathieu_Ms_e(VALUE module, VALUE n1, VALUE n2, VALUE q, VALUE x)
+{
+  return sf_mathieu_eval_e_int2_double2(n1, n2, q, x, gsl_sf_mathieu_Ms);
+}
+static VALUE rb_gsl_sf_mathieu_Ms(VALUE module, VALUE n1, VALUE n2, VALUE q, VALUE x)
+{
+  return sf_mathieu_eval2(n1, n2, q, x, gsl_sf_mathieu_Ms);
+}
+static VALUE rb_gsl_sf_mathieu_Ms_array(VALUE module, int argc, VALUE *argv)
+{
+  return sf_mathieu_array_eval3(argc, argv, gsl_sf_mathieu_Ms_array);
+}
+/*****/
+void Init_sf_mathieu(VALUE module)
+{
+  VALUE mMathieu;
+
+  mMathieu = rb_define_module_under(module, "Mathieu");
+  cWorkspace = rb_define_class_under(mMathieu, "Workspace", cGSL_Object);
+  rb_define_singleton_method(cWorkspace, "alloc", rb_gsl_sf_mathieu_alloc, 2);
+
+  rb_define_module_function(module, "mathieu_a", rb_gsl_sf_mathieu_a, 2);
+  rb_define_module_function(module, "mathieu_a_e", rb_gsl_sf_mathieu_a_e, 2);
+  rb_define_module_function(module, "mathieu_a_array", rb_gsl_sf_mathieu_a_array, -1);
+  rb_define_module_function(module, "mathieu_b", rb_gsl_sf_mathieu_b, 2);
+  rb_define_module_function(module, "mathieu_b_e", rb_gsl_sf_mathieu_b_e, 2);
+  rb_define_module_function(module, "mathieu_b_array", rb_gsl_sf_mathieu_b_array, -1);
+  rb_define_module_function(module, "mathieu_ce", rb_gsl_sf_mathieu_ce, 3);
+  rb_define_module_function(module, "mathieu_ce_e", rb_gsl_sf_mathieu_ce_e, 3);
+  rb_define_module_function(module, "mathieu_ce_array", rb_gsl_sf_mathieu_ce_array, -1);
+  rb_define_module_function(module, "mathieu_se", rb_gsl_sf_mathieu_se, 3);
+  rb_define_module_function(module, "mathieu_se_e", rb_gsl_sf_mathieu_se_e, 3);
+  rb_define_module_function(module, "mathieu_se_array", rb_gsl_sf_mathieu_se_array, -1);
+  rb_define_module_function(module, "mathieu_Mc", rb_gsl_sf_mathieu_Mc, 4);
+  rb_define_module_function(module, "mathieu_Mc_e", rb_gsl_sf_mathieu_Mc_e, 4);
+  rb_define_module_function(module, "mathieu_Mc_array", rb_gsl_sf_mathieu_Mc_array, -1);
+  rb_define_module_function(module, "mathieu_Ms", rb_gsl_sf_mathieu_Ms, 4);
+  rb_define_module_function(module, "mathieu_Ms_e", rb_gsl_sf_mathieu_Ms_e, 4);
+  rb_define_module_function(module, "mathieu_Ms_array", rb_gsl_sf_mathieu_Ms_array, -1);
+}

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

@@ -31,19 +31,15 @@ static VALUE rb_gsl_sf_psi_e(VALUE obj, VALUE x)
   return rb_gsl_sf_eval_e(gsl_sf_psi_e, x);
 }
 
-#ifdef GSL_1_6_LATER
 static VALUE rb_gsl_sf_psi_1(VALUE obj, VALUE x)
 {
   return rb_gsl_sf_eval1(gsl_sf_psi_1, x);
 }
-#endif
 
-#ifdef GSL_1_4_9_LATER
 static VALUE rb_gsl_sf_psi_1_e(VALUE obj, VALUE x)
 {
   return rb_gsl_sf_eval_e(gsl_sf_psi_1_e, x);
 }
-#endif
 
 static VALUE rb_gsl_sf_psi_1piy(VALUE obj, VALUE x)
 {
@@ -88,11 +84,6 @@ void Init_gsl_sf_psi(VALUE module)
 
   rb_define_module_function(module, "psi",  rb_gsl_sf_psi, 1);
   rb_define_module_function(module, "psi_e",  rb_gsl_sf_psi_e, 1);
-
-#ifdef GSL_1_6_LATER
-    rb_define_module_function(module, "psi_1",  rb_gsl_sf_psi_1, 1);
-#endif
-#ifdef GSL_1_4_9_LATER
-    rb_define_module_function(module, "psi_1_e",  rb_gsl_sf_psi_1_e, 1);
-#endif
+  rb_define_module_function(module, "psi_1",  rb_gsl_sf_psi_1, 1);
+  rb_define_module_function(module, "psi_1_e",  rb_gsl_sf_psi_1_e, 1);
 }