gsl 1.15.3 → 1.16.0.6

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

@@ -9,15 +9,12 @@
   WITHOUT ANY WARRANTY.
 */
 
-#include "rb_gsl.h"
-#include "rb_gsl_common.h"
-#include "rb_gsl_array.h"
-#include "rb_gsl_function.h"
+#include "include/rb_gsl.h"
+#include "include/rb_gsl_common.h"
+#include "include/rb_gsl_array.h"
+#include "include/rb_gsl_function.h"
 #include <gsl/gsl_math.h>
 #include <gsl/gsl_chebyshev.h>
-#ifdef HAVE_NARRAY_H
-#include "narray.h"
-#endif
 
 static VALUE cgsl_cheb;
 
@@ -98,10 +95,6 @@ static VALUE rb_gsl_cheb_eval(VALUE obj, VALUE xx)
   size_t i, j, n;
   gsl_vector *v = NULL, *vnew = NULL;
   gsl_matrix *m = NULL, *mnew = NULL;
-#ifdef HAVE_NARRAY_H
-  struct NARRAY *na;
-  double *ptr1, *ptr2;
-#endif
   Data_Get_Struct(obj, gsl_cheb_series, p);
   if (CLASS_OF(xx) == rb_cRange) xx = rb_gsl_range2ary(xx);
   switch (TYPE(xx)) {
@@ -124,6 +117,8 @@ static VALUE rb_gsl_cheb_eval(VALUE obj, VALUE xx)
   default:
 #ifdef HAVE_NARRAY_H
     if (NA_IsNArray(xx)) {
+      struct NARRAY *na;
+      double *ptr1, *ptr2;
       GetNArray(xx, na);
       ptr1 = (double*) na->ptr;
       n = na->total;
@@ -137,16 +132,16 @@ static VALUE rb_gsl_cheb_eval(VALUE obj, VALUE xx)
       Data_Get_Struct(xx, gsl_vector, v);
       vnew = gsl_vector_alloc(v->size);
       for (i = 0; i < v->size; i++) {
-	gsl_vector_set(vnew, i, gsl_cheb_eval(p, gsl_vector_get(v, i)));
+        gsl_vector_set(vnew, i, gsl_cheb_eval(p, gsl_vector_get(v, i)));
       }
       return Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, vnew);
     } else if (MATRIX_P(xx)) {
       Data_Get_Struct(xx, gsl_matrix, m);
       mnew = gsl_matrix_alloc(m->size1, m->size2);
       for (i = 0; i < m->size1; i++) {
-	for (j = 0; j < m->size2; j++) {
-	  gsl_matrix_set(mnew, i, j, gsl_cheb_eval(p, gsl_matrix_get(m, i, j)));
-	}
+        for (j = 0; j < m->size2; j++) {
+          gsl_matrix_set(mnew, i, j, gsl_cheb_eval(p, gsl_matrix_get(m, i, j)));
+        }
       }
       return Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, mnew);
     } else {
@@ -165,10 +160,6 @@ static VALUE rb_gsl_cheb_eval_err(VALUE obj, VALUE xx)
   size_t n, i, j;
   gsl_vector *v = NULL, *vnew = NULL, *verr = NULL;
   gsl_matrix *m = NULL, *mnew = NULL, *merr = NULL;
-#ifdef HAVE_NARRAY_H
-  struct NARRAY *na;
-  double *ptr1, *ptr2, *ptr3;
-#endif
   Data_Get_Struct(obj, gsl_cheb_series, p);
   if (CLASS_OF(xx) == rb_cRange) xx = rb_gsl_range2ary(xx);
   switch (TYPE(xx)) {
@@ -195,6 +186,8 @@ static VALUE rb_gsl_cheb_eval_err(VALUE obj, VALUE xx)
   default:
 #ifdef HAVE_NARRAY_H
     if (NA_IsNArray(xx)) {
+      struct NARRAY *na;
+      double *ptr1, *ptr2, *ptr3;
       GetNArray(xx, na);
       ptr1 = (double*) na->ptr;
       n = na->total;
@@ -203,9 +196,9 @@ static VALUE rb_gsl_cheb_eval_err(VALUE obj, VALUE xx)
       ptr2 = NA_PTR_TYPE(ary,double*);
       ptr3 = NA_PTR_TYPE(aerr,double*);
       for (i = 0; i < n; i++) {
-	gsl_cheb_eval_err(p, ptr1[i], &result, &err);
-	ptr2[i] = result;
-	ptr3[i] = err;
+        gsl_cheb_eval_err(p, ptr1[i], &result, &err);
+        ptr2[i] = result;
+        ptr3[i] = err;
       }
       return rb_ary_new3(2, ary, aerr);
     }
@@ -215,27 +208,27 @@ static VALUE rb_gsl_cheb_eval_err(VALUE obj, VALUE xx)
       vnew = gsl_vector_alloc(v->size);
       verr = gsl_vector_alloc(v->size);
       for (i = 0; i < v->size; i++) {
-	gsl_cheb_eval_err(p, gsl_vector_get(v, i), &result, &err);
-	gsl_vector_set(vnew, i, result);
-	gsl_vector_set(verr, i, err);
+        gsl_cheb_eval_err(p, gsl_vector_get(v, i), &result, &err);
+        gsl_vector_set(vnew, i, result);
+        gsl_vector_set(verr, i, err);
       }
-      return rb_ary_new3(2, 
-			 Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, vnew),
-			 Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, verr));
+      return rb_ary_new3(2,
+                         Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, vnew),
+                         Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, verr));
     } else if (MATRIX_P(xx)) {
       Data_Get_Struct(xx, gsl_matrix, m);
       mnew = gsl_matrix_alloc(m->size1, m->size2);
       merr = gsl_matrix_alloc(m->size1, m->size2);
       for (i = 0; i < m->size1; i++) {
-	for (j = 0; j < m->size2; j++) {
-	  gsl_cheb_eval_err(p, gsl_matrix_get(m, i, j), &result, &err);
-	  gsl_matrix_set(mnew, i, j, result);
-	  gsl_matrix_set(merr, i, j, err);
-	}
+        for (j = 0; j < m->size2; j++) {
+          gsl_cheb_eval_err(p, gsl_matrix_get(m, i, j), &result, &err);
+          gsl_matrix_set(mnew, i, j, result);
+          gsl_matrix_set(merr, i, j, err);
+        }
       }
       return rb_ary_new3(2,
-			 Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, mnew),
-			 Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, merr));
+                         Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, mnew),
+                         Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, merr));
     } else {
       rb_raise(rb_eTypeError, "wrong argument type");
     }
@@ -251,10 +244,6 @@ static VALUE rb_gsl_cheb_eval_n(VALUE obj, VALUE nn, VALUE xx)
   size_t n, order, i, j;
   gsl_vector *v = NULL, *vnew = NULL;
   gsl_matrix *m = NULL, *mnew = NULL;
-#ifdef HAVE_NARRAY_H
-  struct NARRAY *na;
-  double *ptr1, *ptr2;
-#endif
   CHECK_FIXNUM(nn);
   order = FIX2INT(nn);
   Data_Get_Struct(obj, gsl_cheb_series, p);
@@ -279,6 +268,8 @@ static VALUE rb_gsl_cheb_eval_n(VALUE obj, VALUE nn, VALUE xx)
   default:
 #ifdef HAVE_NARRAY_H
     if (NA_IsNArray(xx)) {
+      struct NARRAY *na;
+      double *ptr1, *ptr2;
       GetNArray(xx, na);
       ptr1 = (double*) na->ptr;
       n = na->total;
@@ -292,17 +283,17 @@ static VALUE rb_gsl_cheb_eval_n(VALUE obj, VALUE nn, VALUE xx)
       Data_Get_Struct(xx, gsl_vector, v);
       vnew = gsl_vector_alloc(v->size);
       for (i = 0; i < v->size; i++) {
-	gsl_vector_set(vnew, i, gsl_cheb_eval_n(p, order, gsl_vector_get(v, i)));
+        gsl_vector_set(vnew, i, gsl_cheb_eval_n(p, order, gsl_vector_get(v, i)));
       }
       return Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, vnew);
     } else if (MATRIX_P(xx)) {
       Data_Get_Struct(xx, gsl_matrix, m);
       mnew = gsl_matrix_alloc(m->size1, m->size2);
       for (i = 0; i < m->size1; i++) {
-	for (j = 0; j < m->size2; j++) {
-	  gsl_matrix_set(mnew, i, j, 
-			 gsl_cheb_eval_n(p, order, gsl_matrix_get(m, i, j)));
-	}
+        for (j = 0; j < m->size2; j++) {
+          gsl_matrix_set(mnew, i, j,
+                         gsl_cheb_eval_n(p, order, gsl_matrix_get(m, i, j)));
+        }
       }
       return Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, mnew);
     } else {
@@ -321,11 +312,7 @@ static VALUE rb_gsl_cheb_eval_n_err(VALUE obj, VALUE nn, VALUE xx)
   size_t n, order, i, j;
   gsl_vector *v, *vnew, *verr;
   gsl_matrix *m, *mnew, *merr;
-#ifdef HAVE_NARRAY_H
-  struct NARRAY *na;
-  double *ptr1, *ptr2, *ptr3;
-#endif
-  CHECK_FIXNUM(nn); 
+  CHECK_FIXNUM(nn);
   order = FIX2INT(nn);
   Data_Get_Struct(obj, gsl_cheb_series, p);
   if (CLASS_OF(xx) == rb_cRange) xx = rb_gsl_range2ary(xx);
@@ -353,6 +340,8 @@ static VALUE rb_gsl_cheb_eval_n_err(VALUE obj, VALUE nn, VALUE xx)
   default:
 #ifdef HAVE_NARRAY_H
     if (NA_IsNArray(xx)) {
+      struct NARRAY *na;
+      double *ptr1, *ptr2, *ptr3;
       GetNArray(xx, na);
       ptr1 = (double*) na->ptr;
       n = na->total;
@@ -361,9 +350,9 @@ static VALUE rb_gsl_cheb_eval_n_err(VALUE obj, VALUE nn, VALUE xx)
       ptr2 = NA_PTR_TYPE(ary,double*);
       ptr3 = NA_PTR_TYPE(aerr,double*);
       for (i = 0; i < n; i++) {
-	gsl_cheb_eval_n_err(p, order, ptr1[i], &result, &err);
-	ptr2[i] = result;
-	ptr3[i] = err;
+        gsl_cheb_eval_n_err(p, order, ptr1[i], &result, &err);
+        ptr2[i] = result;
+        ptr3[i] = err;
       }
       return rb_ary_new3(2, ary, aerr);
     }
@@ -373,27 +362,27 @@ static VALUE rb_gsl_cheb_eval_n_err(VALUE obj, VALUE nn, VALUE xx)
       vnew = gsl_vector_alloc(v->size);
       verr = gsl_vector_alloc(v->size);
       for (i = 0; i < v->size; i++) {
-	gsl_cheb_eval_n_err(p, order, gsl_vector_get(v, i), &result, &err);
-	gsl_vector_set(vnew, i, result);
-	gsl_vector_set(verr, i, err);
+        gsl_cheb_eval_n_err(p, order, gsl_vector_get(v, i), &result, &err);
+        gsl_vector_set(vnew, i, result);
+        gsl_vector_set(verr, i, err);
       }
-      return rb_ary_new3(2, 
-			 Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, vnew),
-			 Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, verr));
+      return rb_ary_new3(2,
+                         Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, vnew),
+                         Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, verr));
     } else if (MATRIX_P(xx)) {
       Data_Get_Struct(xx, gsl_matrix, m);
       mnew = gsl_matrix_alloc(m->size1, m->size2);
       merr = gsl_matrix_alloc(m->size1, m->size2);
       for (i = 0; i < m->size1; i++) {
-	for (j = 0; j < m->size2; j++) {
-	  gsl_cheb_eval_n_err(p, order, gsl_matrix_get(m, i, j), &result, &err);
-	  gsl_matrix_set(mnew, i, j, result);
-	  gsl_matrix_set(merr, i, j, err);
-	}
+        for (j = 0; j < m->size2; j++) {
+          gsl_cheb_eval_n_err(p, order, gsl_matrix_get(m, i, j), &result, &err);
+          gsl_matrix_set(mnew, i, j, result);
+          gsl_matrix_set(merr, i, j, err);
+        }
       }
       return rb_ary_new3(2,
-			 Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, mnew),
-			 Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, merr));
+                         Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, mnew),
+                         Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, merr));
     } else {
       rb_raise(rb_eTypeError, "wrong argument type");
     }
@@ -412,20 +401,20 @@ static VALUE rb_gsl_cheb_calc_deriv(int argc, VALUE *argv, VALUE obj)
   case T_OBJECT:
     switch (argc) {
     case 1:
-      if (!rb_obj_is_kind_of(argv[0], cgsl_cheb)) 
-	rb_raise(rb_eTypeError, "wrong argument type %s (Cheb expected)",
-		 rb_class2name(CLASS_OF(argv[0])));
+      if (!rb_obj_is_kind_of(argv[0], cgsl_cheb))
+        rb_raise(rb_eTypeError, "wrong argument type %s (Cheb expected)",
+                 rb_class2name(CLASS_OF(argv[0])));
       Data_Get_Struct(argv[0], gsl_cheb_series, cs);
       deriv = gsl_cheb_alloc(cs->order);
       retval = Data_Wrap_Struct(CLASS_OF(argv[0]), 0, gsl_cheb_free, deriv);
       break;
     case 2:
-      if (!rb_obj_is_kind_of(argv[0], cgsl_cheb)) 
-	rb_raise(rb_eTypeError, "argv[0] wrong argument type %s (Cheb expected)",
-		 rb_class2name(CLASS_OF(argv[0])));
-      if (!rb_obj_is_kind_of(argv[1], cgsl_cheb)) 
-	rb_raise(rb_eTypeError, "argv[1] wrong argument type %s (Cheb expected)",
-		 rb_class2name(CLASS_OF(argv[1])));
+      if (!rb_obj_is_kind_of(argv[0], cgsl_cheb))
+        rb_raise(rb_eTypeError, "argv[0] wrong argument type %s (Cheb expected)",
+                 rb_class2name(CLASS_OF(argv[0])));
+      if (!rb_obj_is_kind_of(argv[1], cgsl_cheb))
+        rb_raise(rb_eTypeError, "argv[1] wrong argument type %s (Cheb expected)",
+                 rb_class2name(CLASS_OF(argv[1])));
       Data_Get_Struct(argv[0], gsl_cheb_series, deriv);
       Data_Get_Struct(argv[1], gsl_cheb_series, cs);
       retval = argv[0];
@@ -443,9 +432,9 @@ static VALUE rb_gsl_cheb_calc_deriv(int argc, VALUE *argv, VALUE obj)
       retval = Data_Wrap_Struct(CLASS_OF(obj), 0, gsl_cheb_free, deriv);
       break;
     case 1:
-      if (!rb_obj_is_kind_of(argv[0], cgsl_cheb)) 
-	rb_raise(rb_eTypeError, "argv[0] wrong argument type %s (Cheb expected)",
-		 rb_class2name(CLASS_OF(argv[0])));
+      if (!rb_obj_is_kind_of(argv[0], cgsl_cheb))
+        rb_raise(rb_eTypeError, "argv[0] wrong argument type %s (Cheb expected)",
+                 rb_class2name(CLASS_OF(argv[0])));
       Data_Get_Struct(argv[0], gsl_cheb_series, deriv);
       retval = argv[0];
       break;
@@ -469,20 +458,20 @@ static VALUE rb_gsl_cheb_calc_integ(int argc, VALUE *argv, VALUE obj)
   case T_OBJECT:
     switch (argc) {
     case 1:
-      if (!rb_obj_is_kind_of(argv[0], cgsl_cheb)) 
-	rb_raise(rb_eTypeError, "wrong argument type %s (Cheb expected)",
-		 rb_class2name(CLASS_OF(argv[0])));
+      if (!rb_obj_is_kind_of(argv[0], cgsl_cheb))
+        rb_raise(rb_eTypeError, "wrong argument type %s (Cheb expected)",
+                 rb_class2name(CLASS_OF(argv[0])));
       Data_Get_Struct(argv[0], gsl_cheb_series, cs);
       deriv = gsl_cheb_alloc(cs->order);
       retval = Data_Wrap_Struct(CLASS_OF(argv[0]), 0, gsl_cheb_free, deriv);
       break;
     case 2:
-      if (!rb_obj_is_kind_of(argv[0], cgsl_cheb)) 
-	rb_raise(rb_eTypeError, "argv[0] wrong argument type %s (Cheb expected)",
-		 rb_class2name(CLASS_OF(argv[0])));
-      if (!rb_obj_is_kind_of(argv[1], cgsl_cheb)) 
-	rb_raise(rb_eTypeError, "argv[1] wrong argument type %s (Cheb expected)",
-		 rb_class2name(CLASS_OF(argv[1])));
+      if (!rb_obj_is_kind_of(argv[0], cgsl_cheb))
+        rb_raise(rb_eTypeError, "argv[0] wrong argument type %s (Cheb expected)",
+                 rb_class2name(CLASS_OF(argv[0])));
+      if (!rb_obj_is_kind_of(argv[1], cgsl_cheb))
+        rb_raise(rb_eTypeError, "argv[1] wrong argument type %s (Cheb expected)",
+                 rb_class2name(CLASS_OF(argv[1])));
       Data_Get_Struct(argv[0], gsl_cheb_series, deriv);
       Data_Get_Struct(argv[1], gsl_cheb_series, cs);
       retval = argv[0];
@@ -500,9 +489,9 @@ static VALUE rb_gsl_cheb_calc_integ(int argc, VALUE *argv, VALUE obj)
       retval = Data_Wrap_Struct(CLASS_OF(obj), 0, gsl_cheb_free, deriv);
       break;
     case 1:
-      if (!rb_obj_is_kind_of(argv[0], cgsl_cheb)) 
-	rb_raise(rb_eTypeError, "argv[0] wrong argument type %s (Cheb expected)",
-		 rb_class2name(CLASS_OF(argv[0])));
+      if (!rb_obj_is_kind_of(argv[0], cgsl_cheb))
+        rb_raise(rb_eTypeError, "argv[0] wrong argument type %s (Cheb expected)",
+                 rb_class2name(CLASS_OF(argv[0])));
       Data_Get_Struct(argv[0], gsl_cheb_series, deriv);
       retval = argv[0];
       break;

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

@@ -9,17 +9,15 @@
   WITHOUT ANY WARRANTY.
 */
 
-#include "rb_gsl_config.h"
-#ifdef GSL_1_1_LATER
-#include "rb_gsl_common.h"
-#include "rb_gsl_array.h"
+#include "include/rb_gsl_common.h"
+#include "include/rb_gsl_array.h"
 
 static VALUE cgsl_combination_data;
 
 static VALUE rb_gsl_combination_new(VALUE klass, VALUE n, VALUE k)
 {
   gsl_combination *c = NULL;
-  CHECK_FIXNUM(n);CHECK_FIXNUM(k);
+  CHECK_FIXNUM(n); CHECK_FIXNUM(k);
   c = gsl_combination_alloc(FIX2INT(n), FIX2INT(k));
   return Data_Wrap_Struct(klass, 0, gsl_combination_free, c);
 }
@@ -27,7 +25,7 @@ static VALUE rb_gsl_combination_new(VALUE klass, VALUE n, VALUE k)
 static VALUE rb_gsl_combination_calloc(VALUE klass, VALUE n, VALUE k)
 {
   gsl_combination *c = NULL;
-  CHECK_FIXNUM(n);CHECK_FIXNUM(k);
+  CHECK_FIXNUM(n); CHECK_FIXNUM(k);
   c = gsl_combination_calloc(FIX2INT(n), FIX2INT(k));
   return Data_Wrap_Struct(klass, 0, gsl_combination_free, c);
 }
@@ -48,18 +46,16 @@ static VALUE rb_gsl_combination_init_last(VALUE obj)
   return obj;
 }
 
-#ifdef GSL_1_4_LATER
 /* singleton */
 static VALUE rb_gsl_combination_memcpy(VALUE klass, VALUE dst, VALUE src)
 {
   gsl_combination *c, *c2;
   if (!rb_obj_is_kind_of(dst, klass))
     rb_raise(rb_eTypeError, "wrong argument type %s (Combination expected)",
-	     rb_class2name(CLASS_OF(dst)));
+             rb_class2name(CLASS_OF(dst)));
   if (!rb_obj_is_kind_of(src, klass))
     rb_raise(rb_eTypeError, "wrong argument type %s (Combination expected)",
-	     rb_class2name(CLASS_OF(src)));
-
+             rb_class2name(CLASS_OF(src)));
   Data_Get_Struct(dst, gsl_combination, c2);
   Data_Get_Struct(src, gsl_combination, c);
   gsl_combination_memcpy(c2, c);
@@ -74,7 +70,6 @@ static VALUE rb_gsl_combination_clone(VALUE obj)
   gsl_combination_memcpy(c2, c);
   return Data_Wrap_Struct(CLASS_OF(obj), 0, gsl_combination_free, c2);
 }
-#endif
 
 static VALUE rb_gsl_combination_get(VALUE obj, VALUE ii)
 {
@@ -183,9 +178,8 @@ static VALUE rb_gsl_combination_fprintf(int argc, VALUE *argv, VALUE obj)
   FILE *fp = NULL;
   int status, flag = 0;
 
-  if (argc != 1 && argc != 2) rb_raise(rb_eArgError, 
-				       "wrong number of arguments (%d for 1 or 2)", argc);
-
+  if (argc != 1 && argc != 2) rb_raise(rb_eArgError,
+                                       "wrong number of arguments (%d for 1 or 2)", argc);
   Data_Get_Struct(obj, gsl_combination, h);
   fp = rb_gsl_open_writefile(argv[0], &flag);
   switch (argc) {
@@ -247,17 +241,15 @@ void Init_gsl_combination(VALUE module)
 {
   VALUE cgsl_combination;
   cgsl_combination = rb_define_class_under(module, "Combination", cGSL_Object);
-  cgsl_combination_data = rb_define_class_under(cgsl_combination, "Data", 
-						cgsl_permutation);
+  cgsl_combination_data = rb_define_class_under(cgsl_combination, "Data",
+                                                cgsl_permutation);
   rb_define_singleton_method(cgsl_combination, "new", rb_gsl_combination_new, 2);
   rb_define_singleton_method(cgsl_combination, "alloc", rb_gsl_combination_new, 2);
   rb_define_singleton_method(cgsl_combination, "calloc", rb_gsl_combination_calloc, 2);
   rb_define_method(cgsl_combination, "init_first", rb_gsl_combination_init_first, 0);
   rb_define_method(cgsl_combination, "init_last", rb_gsl_combination_init_last, 0);
-#ifdef GSL_1_4_LATER
   rb_define_singleton_method(cgsl_combination, "memcpy", rb_gsl_combination_memcpy, 2);
   rb_define_method(cgsl_combination, "clone", rb_gsl_combination_clone, 0);
-#endif
   rb_define_method(cgsl_combination, "get", rb_gsl_combination_get, 1);
   rb_define_alias(cgsl_combination, "[]", "get");
   rb_define_method(cgsl_combination, "set", rb_gsl_combination_set, 2);
@@ -280,4 +272,4 @@ void Init_gsl_combination(VALUE module)
   rb_define_method(cgsl_combination, "equal?", rb_gsl_combination_equal, 1);
   rb_define_alias(cgsl_combination, "==", "equal?");
 }
-#endif
+

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

@@ -9,20 +9,14 @@
   WITHOUT ANY WARRANTY.
 */
 
-#include "rb_gsl_config.h"
-
-#include "rb_gsl_array.h"
-#include "rb_gsl_histogram.h"
+#include "include/rb_gsl_array.h"
+#include "include/rb_gsl_histogram.h"
 #include <string.h>
 #include <ctype.h>
 
 FILE* rb_gsl_open_writefile(VALUE io, int *flag)
 {
-#ifdef RUBY_1_9_LATER
   rb_io_t *fptr = NULL;
-#else
-  OpenFile *fptr = NULL;
-#endif
   FILE *fp = NULL;
   char *name;
   switch (TYPE(io)) {
@@ -33,19 +27,8 @@ FILE* rb_gsl_open_writefile(VALUE io, int *flag)
     break;
   case T_FILE:
     GetOpenFile(io, fptr);
-    /*
-#ifdef RUBY_1_9_LATER
-    name = STR2CSTR(fptr->pathv);
-#else
-    name = fptr->path;
-#endif
-    */
     rb_io_check_writable(fptr);
-#ifdef RUBY_1_9_LATER
     fp = rb_io_stdio_file(fptr);
-#else
-    fp = GetWriteFile(fptr);
-#endif
     *flag = 0;
     break;
   default:
@@ -59,11 +42,7 @@ FILE* rb_gsl_open_writefile(VALUE io, int *flag)
 
 FILE* rb_gsl_open_readfile(VALUE io, int *flag)
 {
-#ifdef RUBY_1_9_LATER
   rb_io_t *fptr = NULL;
-#else
-  OpenFile *fptr = NULL;
-#endif
   FILE *fp = NULL;
   char *name;
   switch (TYPE(io)) {
@@ -74,19 +53,8 @@ FILE* rb_gsl_open_readfile(VALUE io, int *flag)
     break;
   case T_FILE:
     GetOpenFile(io, fptr);
-    /*
-#ifdef RUBY_1_9_LATER
-    name = STR2CSTR(fptr->pathv);
-#else
-    name = fptr->path;
-#endif
-    */
     rb_io_check_readable(fptr);
-#ifdef RUBY_1_9_LATER
     fp = rb_io_stdio_file(fptr);
-#else
-    fp = fptr->f;
-#endif
     *flag = 0;
     break;
   default:
@@ -138,8 +106,8 @@ size_t count_columns(const char *str)
       flag = 1;
     } else {
       if (flag == 1) {
-	flag = 0;
-	n++;
+        flag = 0;
+        n++;
       }
     }
     p++;
@@ -158,9 +126,9 @@ char* str_scan_double(const char *str, double *val)
   do {
     if (isspace(*p)) {
       if (flag == 0) {
-	/* do nothing */
+        /* do nothing */
       } else {
-	break;
+        break;
       }
     } else {
       *q++ = *p;
@@ -194,9 +162,9 @@ char* str_scan_int(const char *str, int *val)
   do {
     if (isspace(*p)) {
       if (flag == 0) {
-	/* do nothing */
+        /* do nothing */
       } else {
-	break;
+        break;
       }
     } else {
       *q++ = *p;
@@ -257,7 +225,7 @@ gsl_complex ary2complex(VALUE obj)
       c = *z;
     } else {
       rb_raise(rb_eTypeError, "wrong argument type %s (Array or Complex expected)",
-	       rb_class2name(CLASS_OF(obj)));
+               rb_class2name(CLASS_OF(obj)));
     }
     break;
   }