gsl 1.15.3 → 1.16.0.6

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

@@ -9,12 +9,10 @@
   This library is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY.
 */
-#include "rb_gsl_config.h"
-#include "rb_gsl_array.h"
-#include "rb_gsl_complex.h"
-#ifdef HAVE_NARRAY_H
-#include "rb_gsl_with_narray.h"
-#endif
+
+#include "include/rb_gsl_array.h"
+#include "include/rb_gsl_complex.h"
+#include "include/rb_gsl_with_narray.h"
 
 VALUE rb_gsl_vector_int_inner_product(int argc, VALUE *argv, VALUE obj);
 VALUE rb_gsl_vector_int_do_something(VALUE obj, void (*func)(gsl_vector_int*));
@@ -31,7 +29,7 @@ VALUE rb_gsl_vector_int_to_f(VALUE obj)
   size_t i;
   Data_Get_Struct(obj, gsl_vector_int, v);
   vnew = gsl_vector_alloc(v->size);
-  for (i = 0; i < v->size; i++) 
+  for (i = 0; i < v->size; i++)
     gsl_vector_set(vnew, i, (double) gsl_vector_int_get(v, i));
   if (VECTOR_INT_COL_P(obj))
     return Data_Wrap_Struct(cgsl_vector_col, 0, gsl_vector_free, vnew);
@@ -92,17 +90,17 @@ static VALUE rb_gsl_vector_int_add(VALUE obj, VALUE b)
     return rb_gsl_vector_add_constant(rb_gsl_vector_int_to_f(obj), b);
     break;
   default:
-   if (rb_obj_is_kind_of(b, cgsl_vector_int)) {
-     Data_Get_Struct(obj, gsl_vector_int, v);
-     Data_Get_Struct(b, gsl_vector_int, vb);
-     vnew = gsl_vector_int_alloc(v->size);
-     gsl_vector_int_memcpy(vnew, v);
-     gsl_vector_int_add(vnew, vb);
-     return Data_Wrap_Struct(VECTOR_INT_ROW_COL(obj), 0, gsl_vector_int_free, vnew);
-   } else {
-     return rb_gsl_vector_add(rb_gsl_vector_int_to_f(obj), b);
-   }
-   break;
+    if (rb_obj_is_kind_of(b, cgsl_vector_int)) {
+      Data_Get_Struct(obj, gsl_vector_int, v);
+      Data_Get_Struct(b, gsl_vector_int, vb);
+      vnew = gsl_vector_int_alloc(v->size);
+      gsl_vector_int_memcpy(vnew, v);
+      gsl_vector_int_add(vnew, vb);
+      return Data_Wrap_Struct(VECTOR_INT_ROW_COL(obj), 0, gsl_vector_int_free, vnew);
+    } else {
+      return rb_gsl_vector_add(rb_gsl_vector_int_to_f(obj), b);
+    }
+    break;
   }
 }
 
@@ -119,12 +117,12 @@ static VALUE rb_gsl_vector_int_sub(VALUE obj, VALUE b)
     break;
   default:
     if (rb_obj_is_kind_of(b, cgsl_vector_int)) {
-     Data_Get_Struct(obj, gsl_vector_int, v);
-     Data_Get_Struct(b, gsl_vector_int, vb);
-     vnew = gsl_vector_int_alloc(v->size);
-     gsl_vector_int_memcpy(vnew, v);
-     gsl_vector_int_sub(vnew, vb);
-     return Data_Wrap_Struct(VECTOR_INT_ROW_COL(obj), 0, gsl_vector_int_free, vnew);
+      Data_Get_Struct(obj, gsl_vector_int, v);
+      Data_Get_Struct(b, gsl_vector_int, vb);
+      vnew = gsl_vector_int_alloc(v->size);
+      gsl_vector_int_memcpy(vnew, v);
+      gsl_vector_int_sub(vnew, vb);
+      return Data_Wrap_Struct(VECTOR_INT_ROW_COL(obj), 0, gsl_vector_int_free, vnew);
     } else {
       return rb_gsl_vector_sub(rb_gsl_vector_int_to_f(obj), b);
     }
@@ -151,7 +149,7 @@ static VALUE rb_gsl_vector_int_mul(VALUE obj, VALUE b)
       argv[0] = obj;
       argv[1] = b;
       return rb_gsl_vector_int_inner_product(2, argv, CLASS_OF(obj));
-    } else  if (VECTOR_INT_ROW_P(obj) && MATRIX_INT_P(b)) {
+    } else if (VECTOR_INT_ROW_P(obj) && MATRIX_INT_P(b)) {
       Data_Get_Struct(obj, gsl_vector_int, v);
       Data_Get_Struct(b, gsl_matrix_int, m);
       vnew = mygsl_vector_int_mul_matrix(v, m);
@@ -162,10 +160,10 @@ static VALUE rb_gsl_vector_int_mul(VALUE obj, VALUE b)
       if (v->size != v2->size) rb_raise(rb_eIndexError, "Vector sizes does not match.");
       m = gsl_matrix_int_alloc(v->size, v2->size);
       for (i = 0; i < v->size; i++) {
-	for (j = 0; j < v2->size; j++) {
-	  val = gsl_vector_int_get(v, i)*gsl_vector_int_get(v2, j);
-	  gsl_matrix_int_set(m, i, j, val);
-	}
+        for (j = 0; j < v2->size; j++) {
+          val = gsl_vector_int_get(v, i)*gsl_vector_int_get(v2, j);
+          gsl_matrix_int_set(m, i, j, val);
+        }
       }
       return Data_Wrap_Struct(cgsl_matrix_int, 0, gsl_matrix_int_free, m);
     } else {

data/ext/{vector_source.c → gsl_native/vector_source.h}

@@ -39,10 +39,10 @@
 void FUNCTION(get_range,beg_en_n)(VALUE range, BASE *beg, BASE *en, size_t *n, int *step);
 
 void get_range_beg_en_n_for_size(VALUE range,
-    int *beg, int *en, size_t *n, int *step, size_t size);
+                                 int *beg, int *en, size_t *n, int *step, size_t size);
 
 void parse_subvector_args(int argc, VALUE *argv, size_t size,
-    size_t *offset, size_t *stride, size_t *n);
+                          size_t *offset, size_t *stride, size_t *n);
 
 void FUNCTION(get_range,beg_en_n)(VALUE range, BASE *beg, BASE *en, size_t *n, int *step)
 {
@@ -66,7 +66,7 @@ void get_range_beg_en_n_for_size(VALUE range, int *beg, int *en, size_t *n, int
 }
 
 void parse_subvector_args(int argc, VALUE *argv, size_t size,
-    size_t *offset, size_t *stride, size_t *n)
+                          size_t *offset, size_t *stride, size_t *n)
 {
   int begin = 0, end, step, length;
   *stride = 1;
@@ -83,22 +83,22 @@ void parse_subvector_args(int argc, VALUE *argv, size_t size,
       // want to let Ruby crash if GSL does not have bounds checking enabled.
       if(begin < 0 || (size_t)begin >= size) {
         rb_raise(rb_eRangeError,
-            "begin value %d is out of range for Vector of length %d",
-		 begin, (int) size);
+                 "begin value %d is out of range for Vector of length %d",
+                 begin, (int) size);
       }
       if(end < 0 || (size_t)end >= size) {
         rb_raise(rb_eRangeError,
-            "end value %d is out of range for Vector of length %d",
-		 end, (int) size);
+                 "end value %d is out of range for Vector of length %d",
+                 end, (int) size);
       }
       *stride = (size_t)step;
     } else {
       CHECK_FIXNUM(argv[0]);
       length = FIX2INT(argv[0]);
-      if((length < 0 && -length > size) || (length > 0 && length > size)) {
+      if((length < 0 && -length > (int) size) || (length > 0 && length > (int) size)) {
         rb_raise(rb_eRangeError,
-            "length %d is out of range for Vector of length %d",
-		 length, (int) size);
+                 "length %d is out of range for Vector of length %d",
+                 length, (int) size);
       } else if(length < 0) {
         begin = length;
         *n = (size_t)(-length);
@@ -113,13 +113,13 @@ void parse_subvector_args(int argc, VALUE *argv, size_t size,
       get_range_beg_en_n_for_size(argv[0], &begin, &end, n, &step, size);
       if(begin < 0 || (size_t)begin >= size) {
         rb_raise(rb_eRangeError,
-            "begin value %d is out of range for Vector of length %d",
-		 (int) begin, (int) size);
+                 "begin value %d is out of range for Vector of length %d",
+                 (int) begin, (int) size);
       }
       if(end < 0 || (size_t)end >= size) {
         rb_raise(rb_eRangeError,
-            "end value %d is out of range for Vector of length %d",
-		 (int) end, (int) size);
+                 "end value %d is out of range for Vector of length %d",
+                 (int) end, (int) size);
       }
       CHECK_FIXNUM(argv[1]);
       step = FIX2INT(argv[1]);
@@ -188,11 +188,7 @@ void FUNCTION(cvector,set_from_rarray)(GSL_TYPE(gsl_vector) *v, VALUE ary)
   size_t i;
   if (CLASS_OF(ary) == rb_cRange) ary = rb_gsl_range2ary(ary);
   Check_Type(ary, T_ARRAY);
-#ifdef RUBY_1_9_LATER
   if (RARRAY_LEN(ary) == 0) return;
-#else
-  if (RARRAY_LEN(ary) == 0) return;
-#endif
   for (i = 0; i < v->size; i++) FUNCTION(gsl_vector,set)(v, i, NUMCONV(rb_ary_entry(ary, i)));
 }
 
@@ -214,13 +210,11 @@ VALUE FUNCTION(rb_gsl_vector,new)(int argc, VALUE *argv, VALUE klass)
   size_t n, i;
   BASE beg, en;
   int step;
-#ifdef HAVE_NARRAY_H
-  VALUE ary2;
-#endif
   switch (argc) {
   case 1:
 #ifdef HAVE_NARRAY_H
     if (NA_IsNArray(argv[0])) {
+      VALUE ary2;
       n = NA_TOTAL(argv[0]);
       v = FUNCTION(gsl_vector,alloc)(n);
       if (v == NULL) rb_raise(rb_eNoMemError, "gsl_vector_alloc failed");
@@ -234,7 +228,7 @@ VALUE FUNCTION(rb_gsl_vector,new)(int argc, VALUE *argv, VALUE klass)
     }
 #endif
     switch (TYPE(argv[0])) {
-    case T_FIXNUM:  
+    case T_FIXNUM:
       /*! if an integer n is given, create an empty vector of length n */
       CHECK_FIXNUM(argv[0]);
       n = FIX2INT(argv[0]);
@@ -247,35 +241,35 @@ VALUE FUNCTION(rb_gsl_vector,new)(int argc, VALUE *argv, VALUE klass)
     case T_FLOAT:
       v = FUNCTION(gsl_vector,alloc)(1);
       switch(TYPE(argv[0])) {
-        case T_FIXNUM: case T_BIGNUM: case T_FLOAT:
-          xnative = NUMCONV2(argv[0]);
-          break;
-        default:
-          xnative = (BASE)0;
+      case T_FIXNUM: case T_BIGNUM: case T_FLOAT:
+        xnative = NUMCONV2(argv[0]);
+        break;
+      default:
+        xnative = (BASE)0;
       }
       FUNCTION(gsl_vector,set)(v, 0, xnative);
       break;
 #ifdef BASE_DOUBLE
-    case T_ARRAY: 
+    case T_ARRAY:
       v = make_cvector_from_rarrays(argv[0]);
       break;
 #endif
     default:
       if (CLASS_OF(argv[0]) == rb_cRange) {
-	FUNCTION(get_range,beg_en_n)(argv[0], &beg, &en, &n, &step);
-	v = FUNCTION(gsl_vector,alloc)(n);
-	FUNCTION(set_ptr_data,by_range)(v->data, v->size, argv[0]);
-	return Data_Wrap_Struct(klass, 0, FUNCTION(gsl_vector,free), v);
+        FUNCTION(get_range,beg_en_n)(argv[0], &beg, &en, &n, &step);
+        v = FUNCTION(gsl_vector,alloc)(n);
+        FUNCTION(set_ptr_data,by_range)(v->data, v->size, argv[0]);
+        return Data_Wrap_Struct(klass, 0, FUNCTION(gsl_vector,free), v);
       } else if (VEC_P(argv[0])) {
-	/*! Create a new vector with the same elements of the vector given */ 
-	Data_Get_Struct(argv[0], GSL_TYPE(gsl_vector), vtmp);
-	v = FUNCTION(gsl_vector,alloc)(vtmp->size);
-	for (i = 0; i < vtmp->size; i++) 
-	  FUNCTION(gsl_vector,set)(v, i, FUNCTION(gsl_vector,get)(vtmp, i));
-	return Data_Wrap_Struct(VEC_ROW_COL(argv[0]), 0, FUNCTION(gsl_vector,free), v);
+        /*! Create a new vector with the same elements of the vector given */
+        Data_Get_Struct(argv[0], GSL_TYPE(gsl_vector), vtmp);
+        v = FUNCTION(gsl_vector,alloc)(vtmp->size);
+        for (i = 0; i < vtmp->size; i++)
+          FUNCTION(gsl_vector,set)(v, i, FUNCTION(gsl_vector,get)(vtmp, i));
+        return Data_Wrap_Struct(VEC_ROW_COL(argv[0]), 0, FUNCTION(gsl_vector,free), v);
       } else {
-	rb_raise(rb_eTypeError, 
-		 "wrong argument type %s", rb_class2name(CLASS_OF(argv[0])));
+        rb_raise(rb_eTypeError,
+                 "wrong argument type %s", rb_class2name(CLASS_OF(argv[0])));
       }
       break;
     }
@@ -283,13 +277,13 @@ VALUE FUNCTION(rb_gsl_vector,new)(int argc, VALUE *argv, VALUE klass)
   default:
     v = FUNCTION(gsl_vector,alloc)(argc);
     if (v == NULL) rb_raise(rb_eNoMemError, "gsl_vector_alloc failed");
-    for (i = 0; i < argc; i++) {
+    for (i = 0; (int) i < argc; i++) {
       switch(TYPE(argv[i])) {
-        case T_FIXNUM: case T_BIGNUM: case T_FLOAT:
-          xnative = NUMCONV2(argv[i]);
-          break;
-        default:
-          xnative = (BASE)0;
+      case T_FIXNUM: case T_BIGNUM: case T_FLOAT:
+        xnative = NUMCONV2(argv[i]);
+        break;
+      default:
+        xnative = (BASE)0;
       }
       FUNCTION(gsl_vector,set)(v, i, xnative);
     }
@@ -326,7 +320,7 @@ static VALUE FUNCTION(rb_gsl_vector,get)(int argc, VALUE *argv, VALUE obj)
     switch (TYPE(argv[0])) {
     case T_FIXNUM:
       i = FIX2INT(argv[0]);
-      if (i < 0) 
+      if (i < 0)
         retval = C_TO_VALUE2(FUNCTION(gsl_vector,get)(v, (size_t) (v->size + i)));
       else
         retval = C_TO_VALUE2(FUNCTION(gsl_vector,get)(v, (size_t) (i)));
@@ -336,7 +330,7 @@ static VALUE FUNCTION(rb_gsl_vector,get)(int argc, VALUE *argv, VALUE obj)
       for (j = 0; j < vnew->size; j++) {
         i = NUMCONV(rb_ary_entry(argv[0], j));
         if (i < 0) k = v->size + i;
-        //	else k = j;
+        //  else k = j;
         else k = i;
         FUNCTION(gsl_vector,set)(vnew, j, FUNCTION(gsl_vector,get)(v, k));
       }
@@ -348,7 +342,7 @@ static VALUE FUNCTION(rb_gsl_vector,get)(int argc, VALUE *argv, VALUE obj)
         vnew = FUNCTION(gsl_vector,alloc)(p->size);
         for (j = 0; j < p->size; j++) {
           k = p->data[j];
-          if (k < 0) k = p->size + j;
+          //if (k < 0) k = p->size + j;
           FUNCTION(gsl_vector,set)(vnew, j, FUNCTION(gsl_vector,get)(v, k));
         }
         retval = Data_Wrap_Struct(GSL_TYPE(cgsl_vector), 0, FUNCTION(gsl_vector,free), vnew);
@@ -412,7 +406,7 @@ void FUNCTION(rb_gsl_vector,set_subvector)(int argc, VALUE *argv, GSL_TYPE(gsl_v
     // Views) well.
     FUNCTION(gsl_vector,memcpy)(&vv.vector, vother);
   } else if(rb_obj_is_kind_of(other, rb_cArray)) {
-    if(n != RARRAY_LEN(other)) {
+    if((int) n != RARRAY_LEN(other)) {
       rb_raise(rb_eRangeError, "lengths do not match (%d != %d)", (int) n, (int) RARRAY_LEN(other));
     }
     for(i = 0; i < n; i++) {
@@ -441,7 +435,6 @@ static VALUE FUNCTION(rb_gsl_vector,set)(int argc, VALUE *argv, VALUE obj)
   if(argc < 1 || argc > 4) {
     rb_raise(rb_eArgError, "wrong number of arguments (%d for 1-4)", argc);
   }
-
   Data_Get_Struct(obj, GSL_TYPE(gsl_vector), v);
   other = argv[argc-1];
 
@@ -462,7 +455,6 @@ static VALUE FUNCTION(rb_gsl_vector,set)(int argc, VALUE *argv, VALUE obj)
     // assignment to v.subvector(...)
     FUNCTION(rb_gsl_vector,set_subvector)(argc-1, argv, v, other);
   }
-
   return obj;
 }
 
@@ -475,7 +467,7 @@ static VALUE FUNCTION(rb_gsl_vector,set_all)(VALUE obj, VALUE xx)
   return obj;
 }
 
-VALUE FUNCTION(rb_gsl_vector,do_something)(VALUE obj, void (*func)(GSL_TYPE(gsl_vector)*))
+VALUE FUNCTION(rb_gsl_vector,do_something)(VALUE obj, void (*func)(GSL_TYPE (gsl_vector)*))
 {
   GSL_TYPE(gsl_vector) *v = NULL;
   Data_Get_Struct(obj, GSL_TYPE(gsl_vector), v);
@@ -511,7 +503,7 @@ static VALUE FUNCTION(rb_gsl_vector,reverse_each)(VALUE obj)
   GSL_TYPE(gsl_vector) *v = NULL;
   size_t i;
   Data_Get_Struct(obj, GSL_TYPE(gsl_vector), v);
-  for (i = v->size-1; i >= 0; i--) {
+  for (i = v->size-1;; i--) {
     rb_yield(C_TO_VALUE2(FUNCTION(gsl_vector,get)(v, i)));
     if (i == 0) break;
   }
@@ -532,7 +524,7 @@ static VALUE FUNCTION(rb_gsl_vector,reverse_each_index)(VALUE obj)
   GSL_TYPE(gsl_vector) *v = NULL;
   size_t i;
   Data_Get_Struct(obj, GSL_TYPE(gsl_vector), v);
-  for (i = v->size-1; i >= 0; i--) {
+  for (i = v->size-1;; i--) {
     rb_yield(INT2FIX(i));
     if (i == 0) break;
   }
@@ -663,9 +655,9 @@ static VALUE FUNCTION(rb_gsl_vector,trans)(VALUE obj)
     return Data_Wrap_Struct(cgsl_vector_int_col, 0, gsl_vector_int_free, vnew);
   else if (VECTOR_INT_COL_P(obj))
     return Data_Wrap_Struct(cgsl_vector_int, 0, gsl_vector_int_free, vnew);
-  else rb_raise(rb_eTypeError, 
-		"wrong type %s (Vector::Int or Vector::Int::Col expected)",
-		rb_class2name(CLASS_OF(obj)));
+  else rb_raise(rb_eTypeError,
+                "wrong type %s (Vector::Int or Vector::Int::Col expected)",
+                rb_class2name(CLASS_OF(obj)));
 #endif
   return Qnil;
 }
@@ -673,18 +665,18 @@ static VALUE FUNCTION(rb_gsl_vector,trans)(VALUE obj)
 static VALUE FUNCTION(rb_gsl_vector,trans_bang)(VALUE obj)
 {
 #ifdef BASE_DOUBLE
-  if (CLASS_OF(obj) == cgsl_vector) RBASIC(obj)->klass = cgsl_vector_col;
-  else if (CLASS_OF(obj) == cgsl_vector_col) RBASIC(obj)->klass = cgsl_vector;
+  if (CLASS_OF(obj) == cgsl_vector) RBGSL_SET_CLASS(obj, cgsl_vector_col);
+  else if (CLASS_OF(obj) == cgsl_vector_col) RBGSL_SET_CLASS(obj, cgsl_vector);
   else {
     rb_raise(rb_eRuntimeError, "method trans! for %s is not permitted.",
-	     rb_class2name(CLASS_OF(obj)));
-  }	
+             rb_class2name(CLASS_OF(obj)));
+  }
 #elif defined(BASE_INT)
-  if (CLASS_OF(obj) == cgsl_vector_int) RBASIC(obj)->klass = cgsl_vector_int_col;
-  else if (CLASS_OF(obj) == cgsl_vector_int_col) RBASIC(obj)->klass = cgsl_vector_int;
+  if (CLASS_OF(obj) == cgsl_vector_int) RBGSL_SET_CLASS(obj, cgsl_vector_int_col);
+  else if (CLASS_OF(obj) == cgsl_vector_int_col) RBGSL_SET_CLASS(obj, cgsl_vector_int);
   else {
     rb_raise(rb_eRuntimeError, "method trans! for %s is not permitted.",
-	     rb_class2name(CLASS_OF(obj)));
+             rb_class2name(CLASS_OF(obj)));
   }
 #endif
   return obj;
@@ -708,7 +700,7 @@ VALUE FUNCTION(rb_gsl_vector,uminus)(VALUE obj)
   }
   if (CLASS_OF(obj) == GSL_TYPE(cgsl_poly))
     return Data_Wrap_Struct(GSL_TYPE(cgsl_poly), 0, FUNCTION(gsl_vector,free), vnew);
-  else 
+  else
     return Data_Wrap_Struct(VEC_ROW_COL(obj), 0, FUNCTION(gsl_vector,free), vnew);
 }
 
@@ -757,7 +749,7 @@ static VALUE FUNCTION(rb_gsl_vector,connect)(int argc, VALUE *argv, VALUE obj)
     Data_Get_Struct(obj, GSL_TYPE(gsl_vector), v);
     total += v->size;
   }
-  for (i = 0; i < argc; i++) {
+  for (i = 0; (int) i < argc; i++) {
     CHECK_VEC(argv[i]);
     Data_Get_Struct(argv[i], GSL_TYPE(gsl_vector), v);
     total += v->size;
@@ -769,7 +761,7 @@ static VALUE FUNCTION(rb_gsl_vector,connect)(int argc, VALUE *argv, VALUE obj)
     memcpy(ptr, v->data, sizeof(BASE)*v->size);
     ptr += v->size;
   }
-  for (i = 0; i < argc; i++) {
+  for (i = 0; (int) i < argc; i++) {
     Data_Get_Struct(argv[i], GSL_TYPE(gsl_vector), v);
     memcpy(ptr, v->data, sizeof(BASE)*v->size);
     ptr += v->size;
@@ -814,7 +806,7 @@ static VALUE FUNCTION(rb_gsl_vector,sgn)(VALUE obj)
     x = FUNCTION(gsl_vector,get)(v, i);
     FUNCTION(gsl_vector,set)(vnew, i, (BASE)(x>0 ? 1 : (x<0 ? -1 : 0)));
   }
-  return Data_Wrap_Struct(VEC_ROW_COL(obj), 0, FUNCTION(gsl_vector,free), vnew);  
+  return Data_Wrap_Struct(VEC_ROW_COL(obj), 0, FUNCTION(gsl_vector,free), vnew);
 }
 
 static VALUE FUNCTION(rb_gsl_vector,abs)(VALUE obj)
@@ -826,7 +818,7 @@ static VALUE FUNCTION(rb_gsl_vector,abs)(VALUE obj)
   for (i = 0; i < v->size; i++) {
     FUNCTION(gsl_vector,set)(vnew, i, (BASE) fabs(FUNCTION(gsl_vector,get)(v, i)));
   }
-  return Data_Wrap_Struct(VEC_ROW_COL(obj), 0, FUNCTION(gsl_vector,free), vnew);  
+  return Data_Wrap_Struct(VEC_ROW_COL(obj), 0, FUNCTION(gsl_vector,free), vnew);
 }
 
 static VALUE FUNCTION(rb_gsl_vector,square)(VALUE obj)
@@ -838,7 +830,7 @@ static VALUE FUNCTION(rb_gsl_vector,square)(VALUE obj)
   for (i = 0; i < v->size; i++) {
     FUNCTION(gsl_vector,set)(vnew, i, gsl_pow_2(FUNCTION(gsl_vector,get)(v, i)));
   }
-  return Data_Wrap_Struct(VEC_ROW_COL(obj), 0, FUNCTION(gsl_vector,free), vnew);  
+  return Data_Wrap_Struct(VEC_ROW_COL(obj), 0, FUNCTION(gsl_vector,free), vnew);
 }
 
 static VALUE FUNCTION(rb_gsl_vector,sqrt)(VALUE obj)
@@ -850,7 +842,7 @@ static VALUE FUNCTION(rb_gsl_vector,sqrt)(VALUE obj)
   for (i = 0; i < v->size; i++) {
     FUNCTION(gsl_vector,set)(vnew, i, sqrt(FUNCTION(gsl_vector,get)(v, i)));
   }
-  return Data_Wrap_Struct(VEC_ROW_COL(obj), 0, FUNCTION(gsl_vector,free), vnew);  
+  return Data_Wrap_Struct(VEC_ROW_COL(obj), 0, FUNCTION(gsl_vector,free), vnew);
 }
 
 static VALUE FUNCTION(rb_gsl_vector,memcpy)(VALUE obj, VALUE dest, VALUE src)
@@ -871,7 +863,7 @@ static VALUE FUNCTION(rb_gsl_vector,clone)(VALUE obj)
   FUNCTION(gsl_vector,memcpy)(vnew, v);
   if (!VEC_VIEW_P(obj))
     return Data_Wrap_Struct(CLASS_OF(obj), 0, FUNCTION(gsl_vector,free), vnew);
-  else 
+  else
     return Data_Wrap_Struct(VEC_ROW_COL(obj), 0, FUNCTION(gsl_vector,free), vnew);
 }
 
@@ -923,7 +915,7 @@ static VALUE FUNCTION(rb_gsl_vector,fprintf)(int argc, VALUE *argv, VALUE obj)
   GSL_TYPE(gsl_vector) *h = NULL;
   FILE *fp = NULL;
   int status, flag = 0;
-  if (argc != 1 && argc != 2) 
+  if (argc != 1 && argc != 2)
     rb_raise(rb_eArgError, "wrong number of arguments (%d for 1 or 2)", argc);
   Data_Get_Struct(obj, GSL_TYPE(gsl_vector), h);
   fp = rb_gsl_open_writefile(argv[0], &flag);
@@ -945,7 +937,7 @@ static VALUE FUNCTION(rb_gsl_vector,printf)(int argc, VALUE *argv, VALUE obj)
   int status;
   Data_Get_Struct(obj, GSL_TYPE(gsl_vector), h);
   if (argc == 1) {
-    if (TYPE(argv[0]) != T_STRING) 
+    if (TYPE(argv[0]) != T_STRING)
       rb_raise(rb_eTypeError, "String expected");
     else
       status = FUNCTION(gsl_vector,fprintf)(stdout, h, STR2CSTR(argv[0]));
@@ -978,7 +970,7 @@ VALUE FUNCTION(rb_gsl_vector,inner_product)(int argc, VALUE *argv, VALUE obj)
   switch (TYPE(obj)) {
   case T_MODULE:  case T_CLASS:  case T_OBJECT:
     if (argc != 2) rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)",
-			    argc);
+                            argc);
     CHECK_VEC(argv[0]);
     CHECK_VEC(argv[1]);
     Data_Get_Struct(argv[0], GSL_TYPE(gsl_vector), v);
@@ -986,7 +978,7 @@ VALUE FUNCTION(rb_gsl_vector,inner_product)(int argc, VALUE *argv, VALUE obj)
     break;
   default:
     if (argc != 1) rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)",
-			    argc);
+                            argc);
     CHECK_VEC(argv[0]);
     Data_Get_Struct(obj, GSL_TYPE(gsl_vector), v);
     Data_Get_Struct(argv[0], GSL_TYPE(gsl_vector), v2);
@@ -1056,7 +1048,7 @@ static VALUE FUNCTION(rb_gsl_vector,equal)(int argc, VALUE *argv, VALUE obj)
   case T_FLOAT:
     x = NUM2DBL(other);
     Data_Get_Struct(obj, GSL_TYPE(gsl_vector), v1);
-    for (i = 0; i < v1->size; i++) 
+    for (i = 0; i < v1->size; i++)
       if (fabs(x-FUNCTION(gsl_vector,get)(v1, i)) > eps) return Qfalse;
     return Qtrue;
     break;
@@ -1112,14 +1104,14 @@ static VALUE FUNCTION(rb_gsl_vector,graph)(int argc, VALUE *argv, VALUE obj)
     if (TYPE(argv[1]) == T_STRING) {
       make_graphcommand(command, argv[1]);
       if (VEC_P(argv[0])) {
-	Data_Get_Struct(argv[0], GSL_TYPE(gsl_vector), x);
+        Data_Get_Struct(argv[0], GSL_TYPE(gsl_vector), x);
       } else {
-	rb_raise(rb_eTypeError, "argv[0] wrong type %s (String or Vector expected)", 
-		 rb_class2name(CLASS_OF(argv[0])));
+        rb_raise(rb_eTypeError, "argv[0] wrong type %s (String or Vector expected)",
+                 rb_class2name(CLASS_OF(argv[0])));
       }
     } else {
-      rb_raise(rb_eTypeError, "argv[1] wrong type %s (String or Vector expected)", 
-	       rb_class2name(CLASS_OF(argv[1])));
+      rb_raise(rb_eTypeError, "argv[1] wrong type %s (String or Vector expected)",
+               rb_class2name(CLASS_OF(argv[1])));
     }
     break;
   default:
@@ -1129,7 +1121,7 @@ static VALUE FUNCTION(rb_gsl_vector,graph)(int argc, VALUE *argv, VALUE obj)
   if (y == NULL) rb_raise(rb_eRuntimeError, "ydata not given");
   fp = popen(command, "w");
   for (i = 0; i < y->size; i++) {
-    if (x == NULL) 
+    if (x == NULL)
       fprintf(fp, "%d %e\n", (int) i, (double) FUNCTION(gsl_vector,get)(y, i));
     else
       fprintf(fp, "%e %e\n", (double) FUNCTION(gsl_vector,get)(x, i), (double) FUNCTION(gsl_vector,get)(y, i));
@@ -1169,14 +1161,14 @@ static VALUE FUNCTION(rb_gsl_vector,graph_step)(int argc, VALUE *argv, VALUE obj
     if (TYPE(argv[1]) == T_STRING) {
       make_graphcommand(command, argv[1]);
       if (VEC_P(argv[0])) {
-	Data_Get_Struct(argv[0], GSL_TYPE(gsl_vector), x);
+        Data_Get_Struct(argv[0], GSL_TYPE(gsl_vector), x);
       } else {
-	rb_raise(rb_eTypeError, "argv[0] wrong type %s (String or Vector expected)", 
-		 rb_class2name(CLASS_OF(argv[0])));
+        rb_raise(rb_eTypeError, "argv[0] wrong type %s (String or Vector expected)",
+                 rb_class2name(CLASS_OF(argv[0])));
       }
     } else {
-      rb_raise(rb_eTypeError, "argv[1] wrong type %s (String or Vector expected)", 
-	       rb_class2name(CLASS_OF(argv[1])));
+      rb_raise(rb_eTypeError, "argv[1] wrong type %s (String or Vector expected)",
+               rb_class2name(CLASS_OF(argv[1])));
     }
     break;
   default:
@@ -1188,19 +1180,19 @@ static VALUE FUNCTION(rb_gsl_vector,graph_step)(int argc, VALUE *argv, VALUE obj
   for (i = 0; i < y->size; i++) {
     if (x == NULL) {
       fprintf(fp, "%d %e\n%d %e\n", (int) i, (double) FUNCTION(gsl_vector,get)(y, i),
-	      (int) (i+1), (double) FUNCTION(gsl_vector,get)(y, i));
+              (int) (i+1), (double) FUNCTION(gsl_vector,get)(y, i));
     } else {
-      if (i != y->size-1) 
-	fprintf(fp, "%e %e\n%e %e\n", (double) FUNCTION(gsl_vector,get)(x, i), 
-	(double) FUNCTION(gsl_vector,get)(y, i),
-	(double) FUNCTION(gsl_vector,get)(x, i+1), 
-	(double) FUNCTION(gsl_vector,get)(y, i));
+      if (i != y->size-1)
+        fprintf(fp, "%e %e\n%e %e\n", (double) FUNCTION(gsl_vector,get)(x, i),
+                (double) FUNCTION(gsl_vector,get)(y, i),
+                (double) FUNCTION(gsl_vector,get)(x, i+1),
+                (double) FUNCTION(gsl_vector,get)(y, i));
       else
-	fprintf(fp, "%e %e\n%e %e", 
-	(double) FUNCTION(gsl_vector,get)(x, i), 
-	(double) FUNCTION(gsl_vector,get)(y, i),
-	2.0*FUNCTION(gsl_vector,get)(x, i)-FUNCTION(gsl_vector,get)(x, i-1), 
-	(double) FUNCTION(gsl_vector,get)(y, i));
+        fprintf(fp, "%e %e\n%e %e",
+                (double) FUNCTION(gsl_vector,get)(x, i),
+                (double) FUNCTION(gsl_vector,get)(y, i),
+                2.0*FUNCTION(gsl_vector,get)(x, i)-FUNCTION(gsl_vector,get)(x, i-1),
+                (double) FUNCTION(gsl_vector,get)(y, i));
     }
   }
   fflush(fp);
@@ -1232,7 +1224,7 @@ static VALUE FUNCTION(rb_gsl_vector,plot)(int argc, VALUE *argv, VALUE obj)
       Data_Get_Struct(argv[0], GSL_TYPE(gsl_vector), x);
     } else {
       rb_raise(rb_eTypeError, "wrong argument type %s (String or Vector expected)",
-	       rb_class2name(CLASS_OF(argv[0])));
+               rb_class2name(CLASS_OF(argv[0])));
     }
     break;
   case 2:
@@ -1247,11 +1239,11 @@ static VALUE FUNCTION(rb_gsl_vector,plot)(int argc, VALUE *argv, VALUE obj)
   }
   if (y == NULL) rb_raise(rb_eRuntimeError, "ydata not given");
   for (i = 0; i < y->size; i++) {
-    if (x == NULL) 
+    if (x == NULL)
       fprintf(fp, "%d %e\n", (int) i, (double) FUNCTION(gsl_vector,get)(y, i));
     else
-      fprintf(fp, "%e %e\n", (double) FUNCTION(gsl_vector,get)(x, i), 
-	(double) FUNCTION(gsl_vector,get)(y, i));
+      fprintf(fp, "%e %e\n", (double) FUNCTION(gsl_vector,get)(x, i),
+              (double) FUNCTION(gsl_vector,get)(y, i));
   }
   fprintf(fp, "e\n");
   fflush(fp);
@@ -1265,11 +1257,11 @@ void FUNCTION(gsl_vector,print)(const GSL_TYPE(gsl_vector) *v, VALUE klass)
   size_t i;
   printf("[ ");
   if (klass == cgsl_vector_col || klass == cgsl_vector_col_view
-	|| klass == cgsl_vector_col_view_ro
-	|| klass == cgsl_vector_int_col || klass == cgsl_vector_int_col_view
-	|| klass == cgsl_vector_int_col_view_ro) {
+      || klass == cgsl_vector_col_view_ro
+      || klass == cgsl_vector_int_col || klass == cgsl_vector_int_col_view
+      || klass == cgsl_vector_int_col_view_ro) {
     printf(PRINTF_FORMAT, FUNCTION(gsl_vector,get)(v, 0));
-    for (i = 1; i < v->size; i++) {	
+    for (i = 1; i < v->size; i++) {
       printf(PRINTF_FORMAT, FUNCTION(gsl_vector,get)(v, i));
       if (i != v->size-1) printf("\n");
     }
@@ -1321,16 +1313,16 @@ VALUE FUNCTION(rb_gsl_vector,to_s)(VALUE obj)
     strcpy(format2, format);
 #else
     strcpy(format, PRINTF_FORMAT);
-    strcpy(format2, " "PRINTF_FORMAT);
+    strcpy(format2, " " PRINTF_FORMAT);
 #endif
     for (i = 0; i < v->size; i++) {
       if (i != 0) {
-	strcpy(buf, "  ");
-	rb_str_cat(str, buf, strlen(buf));
+        strcpy(buf, "  ");
+        rb_str_cat(str, buf, strlen(buf));
       }
       x = FUNCTION(gsl_vector,get)(v, i);
-      if (x < 0) sprintf(buf, format, x); 
-      else sprintf(buf, format2, x); 
+      if (x < 0) sprintf(buf, format, x);
+      else sprintf(buf, format2, x);
       if (i != v->size-1) strcat(buf, "\n");
       rb_str_cat(str, buf, strlen(buf));
       if (i >= 20 && i != v->size-1) {
@@ -1345,7 +1337,7 @@ VALUE FUNCTION(rb_gsl_vector,to_s)(VALUE obj)
     for (i = 1; i < v->size; i++) {
       sprintf(buf,  PRINTF_FORMAT, FUNCTION(gsl_vector,get)(v, i));
       rb_str_cat(str, buf, strlen(buf));
-      if (i >= (55/dig) && i != v->size-1) {
+      if ((int) i >= (55/dig) && i != v->size-1) {
         strcpy(buf, "... ");
         rb_str_cat(str, buf, strlen(buf));
         break;
@@ -1409,7 +1401,7 @@ static VALUE FUNCTION(rb_gsl_vector,subvector_with_stride)(int argc, VALUE *argv
       if(offset < 0) {
         rb_raise(rb_eRangeError, "offset %d out of range", offset - (int)v->size);
       }
-    } else if(offset >= v->size) {
+    } else if(offset >= (int) v->size) {
       rb_raise(rb_eRangeError, "offset %d out of range", offset);
     }
     if(step == 0) {
@@ -1463,8 +1455,8 @@ static VALUE FUNCTION(rb_gsl_vector,matrix_view)(int argc, VALUE *argv, VALUE ob
     break;
   case 3:
     mv = ALLOC(QUALIFIED_VIEW(gsl_matrix,view));
-    *mv = FUNCTION(gsl_matrix,view_vector_with_tda)(v, FIX2INT(argv[0]), FIX2INT(argv[1]), 
-				 FIX2INT(argv[2]));
+    *mv = FUNCTION(gsl_matrix,view_vector_with_tda)(v, FIX2INT(argv[0]), FIX2INT(argv[1]),
+                                                    FIX2INT(argv[2]));
     break;
   default:
     rb_raise(rb_eArgError, "wrong number of arguments (%d for 2 or 3)", argc);
@@ -1474,7 +1466,7 @@ static VALUE FUNCTION(rb_gsl_vector,matrix_view)(int argc, VALUE *argv, VALUE ob
 }
 
 static VALUE FUNCTION(rb_gsl_vector,matrix_view_with_tda)(VALUE obj, VALUE nn1, VALUE nn2,
-						VALUE tda)
+                                                          VALUE tda)
 {
   GSL_TYPE(gsl_vector) *v = NULL;
   QUALIFIED_VIEW(gsl_matrix,view) *mv = NULL;
@@ -1487,7 +1479,7 @@ static VALUE FUNCTION(rb_gsl_vector,matrix_view_with_tda)(VALUE obj, VALUE nn1,
 void FUNCTION(mygsl_vector,shift)(GSL_TYPE(gsl_vector) *p, size_t n)
 {
   size_t i;
-  for (i = n; i >= 0; i--) {
+  for (i = n;; i--) {
     FUNCTION(gsl_vector,set)(p, i+1, FUNCTION(gsl_vector,get)(p, i));
     if (i == 0) break;
   }
@@ -1497,7 +1489,7 @@ void FUNCTION(mygsl_vector,shift)(GSL_TYPE(gsl_vector) *p, size_t n)
 void FUNCTION(mygsl_vector,shift_scale2)(GSL_TYPE(gsl_vector) *p, size_t n)
 {
   size_t i;
-  for (i = n; i >= 0; i--) {
+  for (i = n;; i--) {
     FUNCTION(gsl_vector,set)(p, i+1, 2*FUNCTION(gsl_vector,get)(p, i));
     if (i == 0) break;
   }
@@ -1518,16 +1510,16 @@ VALUE FUNCTION(rb_gsl_vector,scale)(VALUE obj, VALUE x)
   GSL_TYPE(gsl_vector) *v, *vnew;
   Data_Get_Struct(obj, GSL_TYPE(gsl_vector), v);
   vnew = FUNCTION(make_vector,clone)(v);
-  FUNCTION(gsl_vector,scale)(vnew, NUMCONV(x));
+  FUNCTION(gsl_vector,scale)(vnew, NUMCONV2(x));
   //  return Data_Wrap_Struct(GSL_TYPE(cgsl_vector), 0, FUNCTION(gsl_vector,free), vnew);
-    return Data_Wrap_Struct(VEC_ROW_COL(obj), 0, FUNCTION(gsl_vector,free), vnew);
+  return Data_Wrap_Struct(VEC_ROW_COL(obj), 0, FUNCTION(gsl_vector,free), vnew);
 }
 
 VALUE FUNCTION(rb_gsl_vector,scale_bang)(VALUE obj, VALUE x)
 {
   GSL_TYPE(gsl_vector) *v = NULL;
   Data_Get_Struct(obj, GSL_TYPE(gsl_vector), v);
-  FUNCTION(gsl_vector,scale)(v, NUMCONV(x));
+  FUNCTION(gsl_vector,scale)(v, NUMCONV2(x));
   return obj;
 }
 
@@ -1536,7 +1528,7 @@ VALUE FUNCTION(rb_gsl_vector,add_constant)(VALUE obj, VALUE x)
   GSL_TYPE(gsl_vector) *v, *vnew;
   Data_Get_Struct(obj, GSL_TYPE(gsl_vector), v);
   vnew = FUNCTION(make_vector,clone)(v);
-  FUNCTION(gsl_vector,add_constant)(vnew, NUMCONV(x));
+  FUNCTION(gsl_vector,add_constant)(vnew, NUMCONV2(x));
   //  return Data_Wrap_Struct(GSL_TYPE(cgsl_vector), 0, FUNCTION(gsl_vector,free), vnew);
   return Data_Wrap_Struct(VEC_ROW_COL(obj), 0, FUNCTION(gsl_vector,free), vnew);
 }
@@ -1545,7 +1537,7 @@ VALUE FUNCTION(rb_gsl_vector,add_constant_bang)(VALUE obj, VALUE x)
 {
   GSL_TYPE(gsl_vector) *v = NULL;
   Data_Get_Struct(obj, GSL_TYPE(gsl_vector), v);
-  FUNCTION(gsl_vector,add_constant)(v, NUMCONV(x));
+  FUNCTION(gsl_vector,add_constant)(v, NUMCONV2(x));
   return obj;
 }
 
@@ -1561,7 +1553,7 @@ QUALIFIED_VIEW(gsl_vector,view)* FUNCTION(rb_gsl_make_vector,view)(BASE *data, s
 }
 
 #ifdef HAVE_TENSOR_TENSOR_H
-#include "rb_gsl_tensor.h"
+#include "include/rb_gsl_tensor.h"
 static VALUE FUNCTION(rb_gsl_vector,to_tensor)(int argc, VALUE *argv, VALUE obj)
 {
   GSL_TYPE(gsl_vector) *v = NULL;
@@ -1604,7 +1596,7 @@ static VALUE FUNCTION(rb_gsl_vector,to_gplot)(int argc, VALUE *argv, VALUE obj)
     if (argc < 1) rb_raise(rb_eArgError, "no vectors given");
     if (TYPE(argv[0]) == T_ARRAY) nv = RARRAY_LEN(argv[0]);
     else nv = argc;
-    vp = (GSL_TYPE(gsl_vector)**) ALLOC_N(GSL_TYPE(gsl_vector)*, nv);
+    vp = (GSL_TYPE(gsl_vector)**)ALLOC_N(GSL_TYPE(gsl_vector)*, nv);
     istart = 0;
     break;
   default:
@@ -1612,18 +1604,18 @@ static VALUE FUNCTION(rb_gsl_vector,to_gplot)(int argc, VALUE *argv, VALUE obj)
     Data_Get_Struct(obj, GSL_TYPE(gsl_vector), v);
     if (argc >= 1 && TYPE(argv[0]) == T_ARRAY) nv = 1 + RARRAY_LEN(argv[0]);
     else nv = argc + 1;
-    vp = (GSL_TYPE(gsl_vector)**) ALLOC_N(GSL_TYPE(gsl_vector)*, nv);
+    vp = (GSL_TYPE(gsl_vector)**)ALLOC_N(GSL_TYPE(gsl_vector)*, nv);
     vp[0] = v; len = v->size;
     istart = 1;
     break;
   }
-  for (i = 0; i < argc; i++) {
+  for (i = 0; (int) i < argc; i++) {
     if (TYPE(argv[0]) == T_ARRAY) tmp = rb_ary_entry(argv[0], i);
     else tmp = argv[i];
     CHECK_VEC(tmp);
     Data_Get_Struct(tmp, GSL_TYPE(gsl_vector), v);
     if (len == 0) len = v->size;
-    if (len != v->size) 
+    if (len != v->size)
       rb_raise(rb_eRuntimeError, "vectors must have equal lengths");
     vp[i+istart] = v;
   }
@@ -1679,7 +1671,7 @@ static VALUE FUNCTION(rb_gsl_vector,collect_bang)(VALUE obj)
 
 /* Modified 2006/Sep/26 */
 GSL_TYPE(gsl_vector)* FUNCTION(mygsl_vector,mul_matrix)(GSL_TYPE(gsl_vector) *v,
-							GSL_TYPE(gsl_matrix) *m)
+                                                        GSL_TYPE(gsl_matrix) *m)
 {
   GSL_TYPE(gsl_vector) *vnew;
   size_t i, j;
@@ -1699,7 +1691,7 @@ GSL_TYPE(gsl_vector)* FUNCTION(mygsl_vector,mul_matrix)(GSL_TYPE(gsl_vector) *v,
 void FUNCTION(mygsl_vector,to_m_circulant)(GSL_TYPE(gsl_matrix) *m, GSL_TYPE(gsl_vector) *v)
 {
   size_t i, j;
-  for (i = v->size-1; i >= 0; i--) {
+  for (i = v->size-1;; i--) {
     for (j = 0; j < v->size; j++) {
       if (j <= i) FUNCTION(gsl_matrix,set)(m, i, j, FUNCTION(gsl_vector,get)(v, v->size-1-i+j));
       else FUNCTION(gsl_matrix,set)(m, i, j, FUNCTION(gsl_vector,get)(v, j-i-1));
@@ -1719,7 +1711,7 @@ static VALUE FUNCTION(rb_gsl_vector,to_m_circulant)(VALUE obj)
 }
 
 static void FUNCTION(mygsl_vector,indgen)(GSL_TYPE(gsl_vector) *v,
-					  BASE start, BASE step)
+                                          BASE start, BASE step)
 {
   size_t k = 0;
   BASE i;
@@ -1738,10 +1730,10 @@ static VALUE FUNCTION(rb_gsl_vector,indgen_singleton)(int argc, VALUE *argv, VAL
   switch (argc) {
   case 3:
     step = NUMCONV2(argv[2]);
-    /* no break */
+  /* no break */
   case 2:
     start = NUMCONV2(argv[1]);
-    /* no break */
+  /* no break */
   case 1:
     n = NUM2INT(argv[0]);
     break;
@@ -1761,7 +1753,7 @@ static VALUE FUNCTION(rb_gsl_vector,indgen)(int argc, VALUE *argv, VALUE obj)
   switch (argc) {
   case 2:
     step = NUMCONV2(argv[1]);
-    /* no break */
+  /* no break */
   case 1:
     start = NUMCONV2(argv[0]);
     break;
@@ -1784,7 +1776,7 @@ static VALUE FUNCTION(rb_gsl_vector,indgen_bang)(int argc, VALUE *argv, VALUE ob
   switch (argc) {
   case 2:
     step = NUMCONV2(argv[1]);
-    /* no break */
+  /* no break */
   case 1:
     start = NUMCONV2(argv[0]);
     break;
@@ -1910,7 +1902,7 @@ static VALUE FUNCTION(rb_gsl_vector,histogram)(int argc, VALUE *argv, VALUE obj)
   Data_Get_Struct(obj, GSL_TYPE(gsl_vector), v);
   switch (argc) {
   case 1:
-    if (rb_obj_is_kind_of(argv[0], rb_cRange)) 
+    if (rb_obj_is_kind_of(argv[0], rb_cRange))
       argv[0] = rb_gsl_range2ary(argv[0]);
     switch (TYPE(argv[0])) {
     case T_FIXNUM:
@@ -1943,7 +1935,7 @@ static VALUE FUNCTION(rb_gsl_vector,histogram)(int argc, VALUE *argv, VALUE obj)
       break;
     default:
       rb_raise(rb_eTypeError, "wrong argument type %s (Array expected)",
-	       rb_class2name(CLASS_OF(argv[1])));
+               rb_class2name(CLASS_OF(argv[1])));
       break;
     }
     h = gsl_histogram_alloc(n);
@@ -1990,56 +1982,56 @@ static VALUE FUNCTION(rb_gsl_vector,concat)(VALUE obj, VALUE other)
   Data_Get_Struct(obj, GSL_TYPE(gsl_vector), v);
 
   switch(TYPE(other)) {
-    case T_FIXNUM:
-    case T_BIGNUM:
-    case T_FLOAT:
-      vnew = FUNCTION(gsl_vector,alloc)(v->size + 1);
-      vv = FUNCTION(gsl_vector,subvector)(vnew, 0, v->size);
-      FUNCTION(gsl_vector,memcpy)(&vv.vector, v);
-      FUNCTION(gsl_vector,set)(vnew, v->size, NUMCONV2(other));
-      break;
+  case T_FIXNUM:
+  case T_BIGNUM:
+  case T_FLOAT:
+    vnew = FUNCTION(gsl_vector,alloc)(v->size + 1);
+    vv = FUNCTION(gsl_vector,subvector)(vnew, 0, v->size);
+    FUNCTION(gsl_vector,memcpy)(&vv.vector, v);
+    FUNCTION(gsl_vector,set)(vnew, v->size, NUMCONV2(other));
+    break;
 
-    case T_ARRAY:
-      size2 = RARRAY_LEN(other);
+  case T_ARRAY:
+    size2 = RARRAY_LEN(other);
+    vnew = FUNCTION(gsl_vector,alloc)(v->size + size2);
+    vv = FUNCTION(gsl_vector,subvector)(vnew, 0, v->size);
+    FUNCTION(gsl_vector,memcpy)(&vv.vector, v);
+    for (i = 0; i < size2; i++) {
+      x = rb_ary_entry(other, i);
+      FUNCTION(gsl_vector,set)(vnew, v->size + i, NUMCONV2(x));
+    }
+    break;
+
+  default:
+    if(rb_obj_is_kind_of(other, rb_cRange)) {
+      FUNCTION(get_range,beg_en_n)(other, &beg, &end, &size2, &step);
       vnew = FUNCTION(gsl_vector,alloc)(v->size + size2);
       vv = FUNCTION(gsl_vector,subvector)(vnew, 0, v->size);
       FUNCTION(gsl_vector,memcpy)(&vv.vector, v);
       for (i = 0; i < size2; i++) {
-        x = rb_ary_entry(other, i);
-        FUNCTION(gsl_vector,set)(vnew, v->size + i, NUMCONV2(x));
-      }
-      break;
-
-    default:
-      if(rb_obj_is_kind_of(other, rb_cRange)) {
-        FUNCTION(get_range,beg_en_n)(other, &beg, &end, &size2, &step);
-        vnew = FUNCTION(gsl_vector,alloc)(v->size + size2);
-        vv = FUNCTION(gsl_vector,subvector)(vnew, 0, v->size);
-        FUNCTION(gsl_vector,memcpy)(&vv.vector, v);
-        for (i = 0; i < size2; i++) {
-          FUNCTION(gsl_vector,set)(vnew, v->size + i, beg);
-          beg += step;
-        }
-      } else if (rb_obj_is_kind_of(other, GSL_TYPE(cgsl_vector))) {
-        Data_Get_Struct(other, GSL_TYPE(gsl_vector), v2);
-        size2 = v2->size;
-        vnew = FUNCTION(gsl_vector,alloc)(v->size + size2);
-        vv = FUNCTION(gsl_vector,subvector)(vnew, 0, v->size);
-        FUNCTION(gsl_vector,memcpy)(&vv.vector, v);
-        vv = FUNCTION(gsl_vector,subvector)(vnew, v->size, size2);
-        FUNCTION(gsl_vector,memcpy)(&vv.vector, v2);
-      } else {
-        rb_raise(rb_eTypeError, "wrong argument type %s (Array, Numeric, Range, or %s expected)",
-            rb_class2name(CLASS_OF(other)), rb_class2name(GSL_TYPE(cgsl_vector)));
+        FUNCTION(gsl_vector,set)(vnew, v->size + i, beg);
+        beg += step;
       }
-      break;
+    } else if (rb_obj_is_kind_of(other, GSL_TYPE(cgsl_vector))) {
+      Data_Get_Struct(other, GSL_TYPE(gsl_vector), v2);
+      size2 = v2->size;
+      vnew = FUNCTION(gsl_vector,alloc)(v->size + size2);
+      vv = FUNCTION(gsl_vector,subvector)(vnew, 0, v->size);
+      FUNCTION(gsl_vector,memcpy)(&vv.vector, v);
+      vv = FUNCTION(gsl_vector,subvector)(vnew, v->size, size2);
+      FUNCTION(gsl_vector,memcpy)(&vv.vector, v2);
+    } else {
+      rb_raise(rb_eTypeError, "wrong argument type %s (Array, Numeric, Range, or %s expected)",
+               rb_class2name(CLASS_OF(other)), rb_class2name(GSL_TYPE(cgsl_vector)));
+    }
+    break;
   }
 
-  return Data_Wrap_Struct(VEC_ROW_COL(obj), 0, FUNCTION(gsl_vector,free), vnew);  
+  return Data_Wrap_Struct(VEC_ROW_COL(obj), 0, FUNCTION(gsl_vector,free), vnew);
 }
 
 void FUNCTION(mygsl_vector,diff)(GSL_TYPE(gsl_vector) *vdst,
-				 GSL_TYPE(gsl_vector) *vsrc, size_t n)
+                                 GSL_TYPE(gsl_vector) *vsrc, size_t n)
 {
   BASE a, b;
   int coef, fac, nn, ff;
@@ -2090,7 +2082,7 @@ static VALUE FUNCTION(rb_gsl_vector,test)(VALUE obj, int (*f)(const double))
   size_t i;
   Data_Get_Struct(obj, GSL_TYPE(gsl_vector), v);
   vi = gsl_vector_int_alloc(v->size);
-  for (i = 0; i < v->size; i++) 
+  for (i = 0; i < v->size; i++)
     gsl_vector_int_set(vi, i, (*f)(FUNCTION(gsl_vector,get)(v, i)));
   return Data_Wrap_Struct(cgsl_vector_int, 0, gsl_vector_int_free, vi);
 }
@@ -2157,7 +2149,7 @@ static VALUE FUNCTION(rb_gsl_vector,delete_at)(VALUE obj, VALUE ii)
   if (i2 < 0) {
     i2 += v->size;
   }
-  if (i2 < 0 || i2 > v->size-1) return Qnil;
+  if (i2 < 0 || i2 > (int) (v->size-1)) return Qnil;
   i = (size_t) i2;
   x = FUNCTION(gsl_vector,get)(v, i);
   memmove(v->data+i, v->data+i+1, sizeof(BASE)*(v->size-1-i));
@@ -2209,7 +2201,7 @@ static VALUE FUNCTION(rb_gsl_vector,delete)(VALUE obj, VALUE yy)
     }
   }
   v->size -= count;
-  return count ? y : Qnil;
+  return count ? (VALUE) y : Qnil;
 }
 
 /* singleton method */
@@ -2231,21 +2223,23 @@ static VALUE FUNCTION(rb_gsl_vector,filescan)(VALUE klass, VALUE file)
   Check_Type(file, T_STRING);
   strcpy(filename, STR2CSTR(file));
   sprintf(buf, "sed '/^#/d' %s | wc", filename);
-  if ((fp = popen(buf, "r")) == NULL) 
+  if ((fp = popen(buf, "r")) == NULL)
     rb_raise(rb_eIOError, "popen failed.");
-  fgets(buf, 1024, fp);
+  if (fgets(buf, 1024, fp) == NULL)
+    rb_sys_fail(0);
   pclose(fp);
   sscanf(buf, "%d", &nn);
   lines = (size_t) nn;  /*  vector length */
-  if ((fp = fopen(filename, "r")) == NULL) 
+  if ((fp = fopen(filename, "r")) == NULL)
     rb_raise(rb_eIOError, "cannot open file %s.", filename);
   while (1) {
-	  fgets(buf, 1024, fp);    /* read the first line to count number of columns */
-	  if (buf[0] == '#') continue;
-	  else break;
-	}
+    if (fgets(buf, 1024, fp) == NULL)    /* read the first line to count number of columns */
+      rb_sys_fail(0);
+    if (buf[0] == '#') continue;
+    else break;
+  }
   n = count_columns(buf);  /* number of vectors to be created */
-  x = (GSL_TYPE(gsl_vector)**) xmalloc(sizeof(GSL_TYPE(gsl_vector)*)*n);
+  x = (GSL_TYPE(gsl_vector)**)xmalloc(sizeof(GSL_TYPE(gsl_vector)*)*n);
   ary = rb_ary_new2(n);
   for (j = 0; j < n; j++) {
     x[j] = FUNCTION(gsl_vector,alloc)(lines);
@@ -2253,10 +2247,11 @@ static VALUE FUNCTION(rb_gsl_vector,filescan)(VALUE klass, VALUE file)
   }
   rewind(fp);
   for (i = 0, ii = 0; ii < lines; i++) {
-		pos = ftell(fp);
-		fgets(buf, 1024, fp);
-		if (buf[0] == '#') continue;
-		fseek(fp, pos, SEEK_SET);
+    pos = ftell(fp);
+    if (fgets(buf, 1024, fp) == NULL)
+      rb_sys_fail(0);
+    if (buf[0] == '#') continue;
+    fseek(fp, pos, SEEK_SET);
     for (j = 0, jj = 0; jj < n; j++) {
       k = fscanf(fp, FORMAT_TMP, &val);
       if (k != 1) continue;
@@ -2270,9 +2265,9 @@ static VALUE FUNCTION(rb_gsl_vector,filescan)(VALUE klass, VALUE file)
 }
 #undef FORMAT_TMP
 
-static int FUNCTION(gsl_vector,eq)(const GSL_TYPE(gsl_vector) *a, 
-				   const GSL_TYPE(gsl_vector) *b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_vector,eq)(const GSL_TYPE(gsl_vector) *a,
+                                   const GSL_TYPE(gsl_vector) *b,
+                                   gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -2286,9 +2281,9 @@ static int FUNCTION(gsl_vector,eq)(const GSL_TYPE(gsl_vector) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_vector,ne)(const GSL_TYPE(gsl_vector) *a, 
-				   const GSL_TYPE(gsl_vector) *b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_vector,ne)(const GSL_TYPE(gsl_vector) *a,
+                                   const GSL_TYPE(gsl_vector) *b,
+                                   gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -2302,9 +2297,9 @@ static int FUNCTION(gsl_vector,ne)(const GSL_TYPE(gsl_vector) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_vector,gt)(const GSL_TYPE(gsl_vector) *a, 
-				   const GSL_TYPE(gsl_vector) *b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_vector,gt)(const GSL_TYPE(gsl_vector) *a,
+                                   const GSL_TYPE(gsl_vector) *b,
+                                   gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -2318,9 +2313,9 @@ static int FUNCTION(gsl_vector,gt)(const GSL_TYPE(gsl_vector) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_vector,ge)(const GSL_TYPE(gsl_vector) *a, 
-				   const GSL_TYPE(gsl_vector) *b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_vector,ge)(const GSL_TYPE(gsl_vector) *a,
+                                   const GSL_TYPE(gsl_vector) *b,
+                                   gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -2334,9 +2329,9 @@ static int FUNCTION(gsl_vector,ge)(const GSL_TYPE(gsl_vector) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_vector,lt)(const GSL_TYPE(gsl_vector) *a, 
-				   const GSL_TYPE(gsl_vector) *b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_vector,lt)(const GSL_TYPE(gsl_vector) *a,
+                                   const GSL_TYPE(gsl_vector) *b,
+                                   gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -2350,9 +2345,9 @@ static int FUNCTION(gsl_vector,lt)(const GSL_TYPE(gsl_vector) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_vector,le)(const GSL_TYPE(gsl_vector) *a, 
-				   const GSL_TYPE(gsl_vector) *b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_vector,le)(const GSL_TYPE(gsl_vector) *a,
+                                   const GSL_TYPE(gsl_vector) *b,
+                                   gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -2366,9 +2361,9 @@ static int FUNCTION(gsl_vector,le)(const GSL_TYPE(gsl_vector) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_vector,and)(const GSL_TYPE(gsl_vector) *a, 
-				   const GSL_TYPE(gsl_vector) *b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_vector,and)(const GSL_TYPE(gsl_vector) *a,
+                                    const GSL_TYPE(gsl_vector) *b,
+                                    gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -2382,9 +2377,9 @@ static int FUNCTION(gsl_vector,and)(const GSL_TYPE(gsl_vector) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_vector,or)(const GSL_TYPE(gsl_vector) *a, 
-				   const GSL_TYPE(gsl_vector) *b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_vector,or)(const GSL_TYPE(gsl_vector) *a,
+                                   const GSL_TYPE(gsl_vector) *b,
+                                   gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -2398,9 +2393,9 @@ static int FUNCTION(gsl_vector,or)(const GSL_TYPE(gsl_vector) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_vector,xor)(const GSL_TYPE(gsl_vector) *a, 
-				    const GSL_TYPE(gsl_vector) *b,
-				    gsl_block_uchar *c)
+static int FUNCTION(gsl_vector,xor)(const GSL_TYPE(gsl_vector) *a,
+                                    const GSL_TYPE(gsl_vector) *b,
+                                    gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -2414,8 +2409,8 @@ static int FUNCTION(gsl_vector,xor)(const GSL_TYPE(gsl_vector) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_vector,eq2)(const GSL_TYPE(gsl_vector) *a, 
-				    BASE b, gsl_block_uchar *c)
+static int FUNCTION(gsl_vector,eq2)(const GSL_TYPE(gsl_vector) *a,
+                                    BASE b, gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -2428,9 +2423,9 @@ static int FUNCTION(gsl_vector,eq2)(const GSL_TYPE(gsl_vector) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_vector,ne2)(const GSL_TYPE(gsl_vector) *a, 
-				   BASE b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_vector,ne2)(const GSL_TYPE(gsl_vector) *a,
+                                    BASE b,
+                                    gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -2443,9 +2438,9 @@ static int FUNCTION(gsl_vector,ne2)(const GSL_TYPE(gsl_vector) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_vector,gt2)(const GSL_TYPE(gsl_vector) *a, 
-				   BASE b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_vector,gt2)(const GSL_TYPE(gsl_vector) *a,
+                                    BASE b,
+                                    gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -2458,9 +2453,9 @@ static int FUNCTION(gsl_vector,gt2)(const GSL_TYPE(gsl_vector) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_vector,ge2)(const GSL_TYPE(gsl_vector) *a, 
-				   BASE b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_vector,ge2)(const GSL_TYPE(gsl_vector) *a,
+                                    BASE b,
+                                    gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -2473,9 +2468,9 @@ static int FUNCTION(gsl_vector,ge2)(const GSL_TYPE(gsl_vector) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_vector,lt2)(const GSL_TYPE(gsl_vector) *a, 
-				   BASE b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_vector,lt2)(const GSL_TYPE(gsl_vector) *a,
+                                    BASE b,
+                                    gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -2488,9 +2483,9 @@ static int FUNCTION(gsl_vector,lt2)(const GSL_TYPE(gsl_vector) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_vector,le2)(const GSL_TYPE(gsl_vector) *a, 
-				    BASE b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_vector,le2)(const GSL_TYPE(gsl_vector) *a,
+                                    BASE b,
+                                    gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -2503,9 +2498,9 @@ static int FUNCTION(gsl_vector,le2)(const GSL_TYPE(gsl_vector) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_vector,and2)(const GSL_TYPE(gsl_vector) *a, 
-				    BASE b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_vector,and2)(const GSL_TYPE(gsl_vector) *a,
+                                     BASE b,
+                                     gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -2518,9 +2513,9 @@ static int FUNCTION(gsl_vector,and2)(const GSL_TYPE(gsl_vector) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_vector,or2)(const GSL_TYPE(gsl_vector) *a, 
-				    BASE b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_vector,or2)(const GSL_TYPE(gsl_vector) *a,
+                                    BASE b,
+                                    gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -2533,9 +2528,9 @@ static int FUNCTION(gsl_vector,or2)(const GSL_TYPE(gsl_vector) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_vector,xor2)(const GSL_TYPE(gsl_vector) *a, 
-				     BASE b,
-				    gsl_block_uchar *c)
+static int FUNCTION(gsl_vector,xor2)(const GSL_TYPE(gsl_vector) *a,
+                                     BASE b,
+                                     gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -2550,12 +2545,12 @@ static int FUNCTION(gsl_vector,xor2)(const GSL_TYPE(gsl_vector) *a,
 
 
 static VALUE FUNCTION(rb_gsl_vector,compare)(VALUE aa, VALUE bb,
-					     int (*cmp)(const GSL_TYPE(gsl_vector)*,
-							const GSL_TYPE(gsl_vector)*,
-							gsl_block_uchar*),
-					     int (*cmp2)(const GSL_TYPE(gsl_vector)*,
-							 BASE,
-							 gsl_block_uchar*))
+                                             int (*cmp)(const GSL_TYPE (gsl_vector)*,
+                                                        const GSL_TYPE (gsl_vector)*,
+                                                        gsl_block_uchar*),
+                                             int (*cmp2)(const GSL_TYPE (gsl_vector)*,
+                                                         BASE,
+                                                         gsl_block_uchar*))
 {
   GSL_TYPE(gsl_vector) *a, *b;
   /*  gsl_vector_int *c;*/
@@ -2565,9 +2560,9 @@ static VALUE FUNCTION(rb_gsl_vector,compare)(VALUE aa, VALUE bb,
   c = gsl_block_uchar_alloc(a->size);
   if (VEC_P(bb)) {
     Data_Get_Struct(bb, GSL_TYPE(gsl_vector), b);
-    if (a->size != b->size) 
-      rb_raise(rb_eRuntimeError, "Vector size mismatch, %d and %d", (int) a->size, 
-	       (int) b->size);
+    if (a->size != b->size)
+      rb_raise(rb_eRuntimeError, "Vector size mismatch, %d and %d", (int) a->size,
+               (int) b->size);
     /*status =*/ (*cmp)(a, b, c);
   } else {
     /*status =*/ (*cmp2)(a, NUMCONV(bb), c);
@@ -2578,55 +2573,55 @@ static VALUE FUNCTION(rb_gsl_vector,compare)(VALUE aa, VALUE bb,
 static VALUE FUNCTION(rb_gsl_vector,eq)(VALUE aa, VALUE bb)
 {
   return FUNCTION(rb_gsl_vector,compare)(aa, bb, FUNCTION(gsl_vector,eq),
-					 FUNCTION(gsl_vector,eq2));
+                                         FUNCTION(gsl_vector,eq2));
 }
 
 static VALUE FUNCTION(rb_gsl_vector,ne)(VALUE aa, VALUE bb)
 {
   return FUNCTION(rb_gsl_vector,compare)(aa, bb, FUNCTION(gsl_vector,ne),
-					 FUNCTION(gsl_vector,ne2));
+                                         FUNCTION(gsl_vector,ne2));
 }
 
 static VALUE FUNCTION(rb_gsl_vector,gt)(VALUE aa, VALUE bb)
 {
   return FUNCTION(rb_gsl_vector,compare)(aa, bb, FUNCTION(gsl_vector,gt),
-					 FUNCTION(gsl_vector,gt2));
+                                         FUNCTION(gsl_vector,gt2));
 }
 
 static VALUE FUNCTION(rb_gsl_vector,ge)(VALUE aa, VALUE bb)
 {
   return FUNCTION(rb_gsl_vector,compare)(aa, bb, FUNCTION(gsl_vector,ge),
-					 FUNCTION(gsl_vector,ge2));
+                                         FUNCTION(gsl_vector,ge2));
 }
 
 static VALUE FUNCTION(rb_gsl_vector,lt)(VALUE aa, VALUE bb)
 {
   return FUNCTION(rb_gsl_vector,compare)(aa, bb, FUNCTION(gsl_vector,lt),
-					 FUNCTION(gsl_vector,lt2));
+                                         FUNCTION(gsl_vector,lt2));
 }
 
 static VALUE FUNCTION(rb_gsl_vector,le)(VALUE aa, VALUE bb)
 {
   return FUNCTION(rb_gsl_vector,compare)(aa, bb, FUNCTION(gsl_vector,le),
-					 FUNCTION(gsl_vector,le2));
+                                         FUNCTION(gsl_vector,le2));
 }
 
 static VALUE FUNCTION(rb_gsl_vector,and)(VALUE aa, VALUE bb)
 {
   return FUNCTION(rb_gsl_vector,compare)(aa, bb, FUNCTION(gsl_vector,and),
-					 FUNCTION(gsl_vector,and2));
+                                         FUNCTION(gsl_vector,and2));
 }
 
 static VALUE FUNCTION(rb_gsl_vector,or)(VALUE aa, VALUE bb)
 {
   return FUNCTION(rb_gsl_vector,compare)(aa, bb, FUNCTION(gsl_vector,or),
-					 FUNCTION(gsl_vector,or2));
+                                         FUNCTION(gsl_vector,or2));
 }
 
 static VALUE FUNCTION(rb_gsl_vector,xor)(VALUE aa, VALUE bb)
 {
   return FUNCTION(rb_gsl_vector,compare)(aa, bb, FUNCTION(gsl_vector,xor),
-					 FUNCTION(gsl_vector,xor2));
+                                         FUNCTION(gsl_vector,xor2));
 }
 
 static VALUE FUNCTION(rb_gsl_vector,not)(VALUE obj)
@@ -2664,11 +2659,11 @@ static VALUE FUNCTION(rb_gsl_vector,any2)(VALUE obj)
 
   Data_Get_Struct(obj, GSL_TYPE(gsl_vector), v);
   if (rb_block_given_p()) {
-    for (i = 0; i < v->size; i++) 
+    for (i = 0; i < v->size; i++)
       if (rb_yield(C_TO_VALUE(FUNCTION(gsl_vector,get)(v, i)))) return Qtrue;
     return Qfalse;
   } else {
-    for (i = 0; i < v->size; i++) 
+    for (i = 0; i < v->size; i++)
       if (v->data[i*v->stride]) return Qtrue;
     return Qfalse;
   }
@@ -2681,11 +2676,11 @@ static VALUE FUNCTION(rb_gsl_vector,none)(VALUE obj)
 
   Data_Get_Struct(obj, GSL_TYPE(gsl_vector), v);
   if (rb_block_given_p()) {
-    for (i = 0; i < v->size; i++) 
+    for (i = 0; i < v->size; i++)
       if (rb_yield(C_TO_VALUE(FUNCTION(gsl_vector,get)(v, i)))) return Qfalse;
     return Qtrue;
   } else {
-    for (i = 0; i < v->size; i++) 
+    for (i = 0; i < v->size; i++)
       if (v->data[i*v->stride]) return Qfalse;
     return Qtrue;
   }
@@ -2698,11 +2693,11 @@ static VALUE FUNCTION(rb_gsl_vector,all)(VALUE obj)
 
   Data_Get_Struct(obj, GSL_TYPE(gsl_vector), v);
   if (rb_block_given_p()) {
-    for (i = 0; i < v->size; i++) 
+    for (i = 0; i < v->size; i++)
       if (!rb_yield(C_TO_VALUE(FUNCTION(gsl_vector,get)(v, i)))) return Qfalse;
     return Qtrue;
   } else {
-    for (i = 0; i < v->size; i++) 
+    for (i = 0; i < v->size; i++)
       if (!v->data[i*v->stride]) return Qfalse;
     return Qtrue;
   }
@@ -2720,10 +2715,10 @@ static VALUE FUNCTION(rb_gsl_vector,where)(VALUE obj)
     btmp = gsl_block_uchar_alloc(v->size);
     for (i = 0; i < v->size; i++) {
       if (rb_yield(C_TO_VALUE(FUNCTION(gsl_vector,get)(v, i)))) {
-	btmp->data[i] = 1;
-	n++;
+        btmp->data[i] = 1;
+        n++;
       } else {
-	btmp->data[i] = 0;
+        btmp->data[i] = 0;
       }
     }  /* for */
   } else { /* block is not given */
@@ -2755,10 +2750,10 @@ static VALUE FUNCTION(rb_gsl_vector,where2)(VALUE obj)
     btmp = gsl_block_uchar_alloc(v->size);
     for (i = 0; i < v->size; i++) {
       if (rb_yield(C_TO_VALUE(FUNCTION(gsl_vector,get)(v, i)))) {
-	btmp->data[i] = 1;
-	n++;
+        btmp->data[i] = 1;
+        n++;
       } else {
-	btmp->data[i] = 0;
+        btmp->data[i] = 0;
       }
     } /* for */
   } else {  /* block is not given */
@@ -2769,11 +2764,11 @@ static VALUE FUNCTION(rb_gsl_vector,where2)(VALUE obj)
     v2 = gsl_permutation_calloc(v->size);  /* calloc() initializes v2 */
     vv1 = Qnil;
     vv2 = Data_Wrap_Struct(cgsl_index, 0, gsl_permutation_free, v2);
-  } else if (v->size-n == 0) { 
+  } else if (v->size-n == 0) {
     v1 = gsl_permutation_calloc(n);           /* calloc() initializes v1 */
-    vv1 = Data_Wrap_Struct(cgsl_index, 0, gsl_permutation_free, v1);     
+    vv1 = Data_Wrap_Struct(cgsl_index, 0, gsl_permutation_free, v1);
     vv2 = Qnil;
-  } else { 
+  } else {
     /* same case as 'where' */
     v1 = gsl_permutation_alloc(n);
     v2 = gsl_permutation_alloc(v->size-n);
@@ -2788,8 +2783,8 @@ static VALUE FUNCTION(rb_gsl_vector,where2)(VALUE obj)
   return rb_ary_new3(2, vv1, vv2);
 }
 
-static VALUE FUNCTION(rb_gsl_vector,op_inplace)(VALUE vv1, VALUE vv2, 
-						int (*f)(GSL_TYPE(gsl_vector)*, const GSL_TYPE(gsl_vector)*))
+static VALUE FUNCTION(rb_gsl_vector,op_inplace)(VALUE vv1, VALUE vv2,
+                                                int (*f)(GSL_TYPE (gsl_vector)*, const GSL_TYPE (gsl_vector)*))
 {
   GSL_TYPE(gsl_vector) *v1, *v2;
   Data_Get_Struct(vv1, GSL_TYPE(gsl_vector), v1);
@@ -2867,32 +2862,31 @@ static VALUE FUNCTION(rb_gsl_vector,zip)(int argc, VALUE *argv, VALUE obj)
     argv2 = argv;
   } else {
     if (argc < 1) rb_raise(rb_eArgError, "Too few arguments.");
-    Data_Get_Struct(argv[0], GSL_TYPE(gsl_vector), v0);    
+    Data_Get_Struct(argv[0], GSL_TYPE(gsl_vector), v0);
     argc2 = argc - 1;
     argv2 = argv + 1;
   }
-  for (i = 0; i < argc2; i++) {
+  for (i = 0; (int) i < argc2; i++) {
     CHECK_VEC(argv2[i]);
   }
-  vp = (GSL_TYPE(gsl_vector)**) malloc(sizeof(GSL_TYPE(gsl_vector)**));
-  for (i = 0; i < argc2; i++) {
+  vp = (GSL_TYPE(gsl_vector)**)malloc(sizeof(GSL_TYPE(gsl_vector)**));
+  for (i = 0; (int) i < argc2; i++) {
     Data_Get_Struct(argv2[i], GSL_TYPE(gsl_vector), vp[i]);
   }
   ary = rb_ary_new2(v0->size);
   for (i = 0; i < v0->size; i++) {
     vnew = FUNCTION(gsl_vector,alloc)(argc2 + 1);
     FUNCTION(gsl_vector,set)(vnew, 0, FUNCTION(gsl_vector,get)(v0, i));
-    for (j = 0; j < argc2; j++) {
+    for (j = 0; (int) j < argc2; j++) {
       if (i < vp[j]->size) {
-	FUNCTION(gsl_vector,set)(vnew, j+1, FUNCTION(gsl_vector,get)(vp[j], i));
+        FUNCTION(gsl_vector,set)(vnew, j+1, FUNCTION(gsl_vector,get)(vp[j], i));
       } else {
-	FUNCTION(gsl_vector,set)(vnew, j+1, 0.0);
+        FUNCTION(gsl_vector,set)(vnew, j+1, 0.0);
       }
     }
     rb_ary_store(ary, i, Data_Wrap_Struct(GSL_TYPE(cgsl_vector), 0, FUNCTION(gsl_vector,free), vnew));
   }
-  
-  free((GSL_TYPE(gsl_vector)**) vp);
+  free((GSL_TYPE(gsl_vector)**)vp);
   return ary;
 }
 
@@ -2956,17 +2950,16 @@ static VALUE FUNCTION(rb_gsl_vector,cumprod)(VALUE obj)
   return Data_Wrap_Struct(VEC_ROW_COL(obj), 0, FUNCTION(gsl_vector,free), vnew);
 }
 
-#ifdef GSL_1_9_LATER
 static VALUE FUNCTION(rb_gsl_vector,property)(VALUE obj,
-  int (*f)(const GSL_TYPE(gsl_vector) *)) {
+                                              int (*f)(const GSL_TYPE (gsl_vector) *)) {
   GSL_TYPE(gsl_vector) *v;
   Data_Get_Struct(obj, GSL_TYPE(gsl_vector), v);
-  return INT2FIX((*f)(v));  
+  return INT2FIX((*f)(v));
 }
 
 static VALUE FUNCTION(rb_gsl_vector,property2)(VALUE obj,
-  int (*f)(const GSL_TYPE(gsl_vector) *)) {
-  GSL_TYPE(gsl_vector) *v;  
+                                               int (*f)(const GSL_TYPE (gsl_vector) *)) {
+  GSL_TYPE(gsl_vector) *v;
   Data_Get_Struct(obj, GSL_TYPE(gsl_vector), v);
   if ((*f)(v)) return Qtrue;
   else return Qfalse;
@@ -2978,19 +2971,17 @@ static VALUE FUNCTION(rb_gsl_vector,ispos)(VALUE obj)
 }
 static VALUE FUNCTION(rb_gsl_vector,ispos2)(VALUE obj)
 {
-  return FUNCTION(rb_gsl_vector,property2)(obj, FUNCTION(gsl_vector, ispos));  
+  return FUNCTION(rb_gsl_vector,property2)(obj, FUNCTION(gsl_vector, ispos));
 }
 static VALUE FUNCTION(rb_gsl_vector,isneg)(VALUE obj)
 {
-  return FUNCTION(rb_gsl_vector,property)(obj, FUNCTION(gsl_vector, isneg));    
+  return FUNCTION(rb_gsl_vector,property)(obj, FUNCTION(gsl_vector, isneg));
 }
 static VALUE FUNCTION(rb_gsl_vector,isneg2)(VALUE obj)
 {
-  return FUNCTION(rb_gsl_vector,property2)(obj, FUNCTION(gsl_vector, isneg));      
+  return FUNCTION(rb_gsl_vector,property2)(obj, FUNCTION(gsl_vector, isneg));
 }
-#endif
 
-#ifdef GSL_1_10_LATER
 static VALUE FUNCTION(rb_gsl_vector,isnonneg)(VALUE obj)
 {
   return FUNCTION(rb_gsl_vector,property)(obj, FUNCTION(gsl_vector, isnonneg));
@@ -2998,19 +2989,18 @@ static VALUE FUNCTION(rb_gsl_vector,isnonneg)(VALUE obj)
 static VALUE FUNCTION(rb_gsl_vector,isnonneg2)(VALUE obj)
 {
   return FUNCTION(rb_gsl_vector,property2)(obj, FUNCTION(gsl_vector, isnonneg));
-}  
-#endif
+}
 
 void FUNCTION(Init_gsl_vector,init)(VALUE module)
 {
-  /*  rb_define_singleton_method(GSL_TYPE(cgsl_vector), "new", 
+  /*  rb_define_singleton_method(GSL_TYPE(cgsl_vector), "new",
       FUNCTION(rb_gsl_vector,new), -1);*/
-  rb_define_singleton_method(GSL_TYPE(cgsl_vector), "[]", 
-			     FUNCTION(rb_gsl_vector,new), -1);
-  rb_define_singleton_method(GSL_TYPE(cgsl_vector), "alloc", 
-			     FUNCTION(rb_gsl_vector,new), -1);
-  rb_define_singleton_method(GSL_TYPE(cgsl_vector), "calloc", 
-			     FUNCTION(rb_gsl_vector,calloc), 1);
+  rb_define_singleton_method(GSL_TYPE(cgsl_vector), "[]",
+                             FUNCTION(rb_gsl_vector,new), -1);
+  rb_define_singleton_method(GSL_TYPE(cgsl_vector), "alloc",
+                             FUNCTION(rb_gsl_vector,new), -1);
+  rb_define_singleton_method(GSL_TYPE(cgsl_vector), "calloc",
+                             FUNCTION(rb_gsl_vector,calloc), 1);
 
 /*****/
   rb_define_method(GSL_TYPE(cgsl_vector), "get", FUNCTION(rb_gsl_vector,get), -1);
@@ -3079,86 +3069,86 @@ void FUNCTION(Init_gsl_vector,init)(VALUE module)
   rb_define_method(GSL_TYPE(cgsl_vector), "cumsum", FUNCTION(rb_gsl_vector,cumsum), 0);
   rb_define_method(GSL_TYPE(cgsl_vector), "cumprod", FUNCTION(rb_gsl_vector,cumprod), 0);
 
-  rb_define_method(GSL_TYPE(cgsl_vector), "connect", 
-		   FUNCTION(rb_gsl_vector,connect), -1);
-  rb_define_singleton_method(GSL_TYPE(cgsl_vector), "connect", 
-			     FUNCTION(rb_gsl_vector,connect), -1);
+  rb_define_method(GSL_TYPE(cgsl_vector), "connect",
+                   FUNCTION(rb_gsl_vector,connect), -1);
+  rb_define_singleton_method(GSL_TYPE(cgsl_vector), "connect",
+                             FUNCTION(rb_gsl_vector,connect), -1);
 
 
   rb_define_method(GSL_TYPE(cgsl_vector), "sgn", FUNCTION(rb_gsl_vector,sgn), 0);
   rb_define_alias(GSL_TYPE(cgsl_vector), "signum", "sgn");
   rb_define_method(GSL_TYPE(cgsl_vector), "abs", FUNCTION(rb_gsl_vector,abs), 0);
   rb_define_alias(GSL_TYPE(cgsl_vector), "fabs", "abs");
-  rb_define_method(GSL_TYPE(cgsl_vector), "square", 
-		   FUNCTION(rb_gsl_vector,square), 0);
+  rb_define_method(GSL_TYPE(cgsl_vector), "square",
+                   FUNCTION(rb_gsl_vector,square), 0);
   rb_define_alias(GSL_TYPE(cgsl_vector), "abs2", "square");
   rb_define_method(GSL_TYPE(cgsl_vector), "sqrt", FUNCTION(rb_gsl_vector,sqrt), 0);
 
-  rb_define_singleton_method(GSL_TYPE(cgsl_vector), "memcpy", 
-			     FUNCTION(rb_gsl_vector,memcpy), 2);
-  rb_define_method(GSL_TYPE(cgsl_vector), "clone", 
-		   FUNCTION(rb_gsl_vector,clone), 0);
+  rb_define_singleton_method(GSL_TYPE(cgsl_vector), "memcpy",
+                             FUNCTION(rb_gsl_vector,memcpy), 2);
+  rb_define_method(GSL_TYPE(cgsl_vector), "clone",
+                   FUNCTION(rb_gsl_vector,clone), 0);
   rb_define_alias(GSL_TYPE(cgsl_vector), "duplicate", "clone");
   rb_define_alias(GSL_TYPE(cgsl_vector), "dup", "clone");
-  rb_define_singleton_method(GSL_TYPE(cgsl_vector), "swap", 
-			     FUNCTION(rb_gsl_vector,swap), 2);
-  rb_define_method(GSL_TYPE(cgsl_vector), "swap_elements", 
-		   FUNCTION(rb_gsl_vector,swap_elements), 2);
-
-  rb_define_method(GSL_TYPE(cgsl_vector), "fwrite", 
-		   FUNCTION(rb_gsl_vector,fwrite), 1);
-  rb_define_method(GSL_TYPE(cgsl_vector), "fread", 
-		   FUNCTION(rb_gsl_vector,fread), 1);
-  rb_define_method(GSL_TYPE(cgsl_vector), "fprintf", 
-		   FUNCTION(rb_gsl_vector,fprintf), -1);
-  rb_define_method(GSL_TYPE(cgsl_vector), "printf", 
-		   FUNCTION(rb_gsl_vector,printf), -1);
-  rb_define_method(GSL_TYPE(cgsl_vector), "fscanf", 
-		   FUNCTION(rb_gsl_vector,fscanf), 1);
+  rb_define_singleton_method(GSL_TYPE(cgsl_vector), "swap",
+                             FUNCTION(rb_gsl_vector,swap), 2);
+  rb_define_method(GSL_TYPE(cgsl_vector), "swap_elements",
+                   FUNCTION(rb_gsl_vector,swap_elements), 2);
+
+  rb_define_method(GSL_TYPE(cgsl_vector), "fwrite",
+                   FUNCTION(rb_gsl_vector,fwrite), 1);
+  rb_define_method(GSL_TYPE(cgsl_vector), "fread",
+                   FUNCTION(rb_gsl_vector,fread), 1);
+  rb_define_method(GSL_TYPE(cgsl_vector), "fprintf",
+                   FUNCTION(rb_gsl_vector,fprintf), -1);
+  rb_define_method(GSL_TYPE(cgsl_vector), "printf",
+                   FUNCTION(rb_gsl_vector,printf), -1);
+  rb_define_method(GSL_TYPE(cgsl_vector), "fscanf",
+                   FUNCTION(rb_gsl_vector,fscanf), 1);
 
   /* 2.Aug.2004 */
-  rb_define_singleton_method(GSL_TYPE(cgsl_vector), "inner_product", 
-			     FUNCTION(rb_gsl_vector,inner_product), -1);
-  rb_define_singleton_method(GSL_TYPE(cgsl_vector), "dot", 
-			     FUNCTION(rb_gsl_vector,inner_product), -1);
+  rb_define_singleton_method(GSL_TYPE(cgsl_vector), "inner_product",
+                             FUNCTION(rb_gsl_vector,inner_product), -1);
+  rb_define_singleton_method(GSL_TYPE(cgsl_vector), "dot",
+                             FUNCTION(rb_gsl_vector,inner_product), -1);
   rb_define_method(GSL_TYPE(cgsl_vector), "inner_product",
-		   FUNCTION(rb_gsl_vector,inner_product), -1);
+                   FUNCTION(rb_gsl_vector,inner_product), -1);
   rb_define_alias(GSL_TYPE(cgsl_vector), "dot", "inner_product");
 
-  rb_define_method(GSL_TYPE(cgsl_vector), "equal?", 
-		   FUNCTION(rb_gsl_vector,equal), -1);
+  rb_define_method(GSL_TYPE(cgsl_vector), "equal?",
+                   FUNCTION(rb_gsl_vector,equal), -1);
   rb_define_alias(GSL_TYPE(cgsl_vector), "==", "equal?");
 
-  rb_define_method(GSL_TYPE(cgsl_vector), "to_poly", 
-		   FUNCTION(rb_gsl_vector,to_poly), 0);
+  rb_define_method(GSL_TYPE(cgsl_vector), "to_poly",
+                   FUNCTION(rb_gsl_vector,to_poly), 0);
 
 /*****/
-  rb_define_method(GSL_TYPE(cgsl_vector), "graph", 
-		   FUNCTION(rb_gsl_vector,graph), -1);
-  rb_define_method(GSL_TYPE(cgsl_vector), "graph_step", 
-		   FUNCTION(rb_gsl_vector,graph_step), -1);
-  rb_define_method(GSL_TYPE(cgsl_vector), "plot", 
-		   FUNCTION(rb_gsl_vector,plot), -1);
+  rb_define_method(GSL_TYPE(cgsl_vector), "graph",
+                   FUNCTION(rb_gsl_vector,graph), -1);
+  rb_define_method(GSL_TYPE(cgsl_vector), "graph_step",
+                   FUNCTION(rb_gsl_vector,graph_step), -1);
+  rb_define_method(GSL_TYPE(cgsl_vector), "plot",
+                   FUNCTION(rb_gsl_vector,plot), -1);
 
   rb_define_method(GSL_TYPE(cgsl_vector), "print",
-		   FUNCTION(rb_gsl_vector,print), 0);
-  rb_define_method(GSL_TYPE(cgsl_vector), "inspect", 
-		   FUNCTION(rb_gsl_vector,inspect), 0);
-  rb_define_method(GSL_TYPE(cgsl_vector), "to_s", 
-		   FUNCTION(rb_gsl_vector,to_s), 0);
+                   FUNCTION(rb_gsl_vector,print), 0);
+  rb_define_method(GSL_TYPE(cgsl_vector), "inspect",
+                   FUNCTION(rb_gsl_vector,inspect), 0);
+  rb_define_method(GSL_TYPE(cgsl_vector), "to_s",
+                   FUNCTION(rb_gsl_vector,to_s), 0);
 
 /*****/
   rb_define_method(GSL_TYPE(cgsl_vector), "subvector",
-		   FUNCTION(rb_gsl_vector,subvector), -1);
+                   FUNCTION(rb_gsl_vector,subvector), -1);
   rb_define_alias(GSL_TYPE(cgsl_vector), "view", "subvector");
-  rb_define_method(GSL_TYPE(cgsl_vector), "subvector_with_stride", 
-		   FUNCTION(rb_gsl_vector,subvector_with_stride), -1);
+  rb_define_method(GSL_TYPE(cgsl_vector), "subvector_with_stride",
+                   FUNCTION(rb_gsl_vector,subvector_with_stride), -1);
   rb_define_alias(GSL_TYPE(cgsl_vector), "view_with_stride", "subvector_with_stride");
 
-  rb_define_method(GSL_TYPE(cgsl_vector), "matrix_view", 
-		   FUNCTION(rb_gsl_vector,matrix_view), -1);
-  rb_define_method(GSL_TYPE(cgsl_vector), "matrix_view_with_tda", 
-		   FUNCTION(rb_gsl_vector,matrix_view_with_tda), 3);
+  rb_define_method(GSL_TYPE(cgsl_vector), "matrix_view",
+                   FUNCTION(rb_gsl_vector,matrix_view), -1);
+  rb_define_method(GSL_TYPE(cgsl_vector), "matrix_view_with_tda",
+                   FUNCTION(rb_gsl_vector,matrix_view_with_tda), 3);
 
 #ifdef BASE_DOUBLE
   rb_undef_method(cgsl_vector_view_ro, "set");
@@ -3172,106 +3162,106 @@ void FUNCTION(Init_gsl_vector,init)(VALUE module)
   rb_undef_method(cgsl_vector_int_col_view_ro, "[]=");
 #endif
 
-  rb_define_method(GSL_TYPE(cgsl_vector), "scale", 
-		   FUNCTION(rb_gsl_vector,scale), 1);
-  rb_define_method(GSL_TYPE(cgsl_vector), "scale!", 
-		   FUNCTION(rb_gsl_vector,scale_bang), 1);
-  rb_define_method(GSL_TYPE(cgsl_vector), "add_constant", 
-		   FUNCTION(rb_gsl_vector,add_constant), 1);
+  rb_define_method(GSL_TYPE(cgsl_vector), "scale",
+                   FUNCTION(rb_gsl_vector,scale), 1);
+  rb_define_method(GSL_TYPE(cgsl_vector), "scale!",
+                   FUNCTION(rb_gsl_vector,scale_bang), 1);
+  rb_define_method(GSL_TYPE(cgsl_vector), "add_constant",
+                   FUNCTION(rb_gsl_vector,add_constant), 1);
   rb_define_alias(GSL_TYPE(cgsl_vector), "add_const", "add_constant");
-  rb_define_method(GSL_TYPE(cgsl_vector), "add_constant!", 
-		   FUNCTION(rb_gsl_vector,add_constant_bang), 1);
+  rb_define_method(GSL_TYPE(cgsl_vector), "add_constant!",
+                   FUNCTION(rb_gsl_vector,add_constant_bang), 1);
   rb_define_alias(GSL_TYPE(cgsl_vector), "add_const!", "add_constant!");
 
 #ifdef HAVE_TENSOR_TENSOR_H
-  rb_define_method(GSL_TYPE(cgsl_vector), "to_tensor", 
-		   FUNCTION(rb_gsl_vector,to_tensor), -1);
+  rb_define_method(GSL_TYPE(cgsl_vector), "to_tensor",
+                   FUNCTION(rb_gsl_vector,to_tensor), -1);
 #endif
 
-  rb_define_singleton_method(GSL_TYPE(cgsl_vector), "to_gplot", 
-			     FUNCTION(rb_gsl_vector,to_gplot), -1);
-  rb_define_singleton_method(GSL_TYPE(cgsl_vector), "to_gsplot", 
-			     FUNCTION(rb_gsl_vector,to_gplot), -1);
-  rb_define_method(GSL_TYPE(cgsl_vector), "to_gplot", 
-		   FUNCTION(rb_gsl_vector,to_gplot), -1);
+  rb_define_singleton_method(GSL_TYPE(cgsl_vector), "to_gplot",
+                             FUNCTION(rb_gsl_vector,to_gplot), -1);
+  rb_define_singleton_method(GSL_TYPE(cgsl_vector), "to_gsplot",
+                             FUNCTION(rb_gsl_vector,to_gplot), -1);
+  rb_define_method(GSL_TYPE(cgsl_vector), "to_gplot",
+                   FUNCTION(rb_gsl_vector,to_gplot), -1);
   rb_define_alias(GSL_TYPE(cgsl_vector), "to_gsplot", "to_gplot");
 
   /*****/
-  rb_define_method(GSL_TYPE(cgsl_vector), "collect", 
-		   FUNCTION(rb_gsl_vector,collect), 0);
-  rb_define_method(GSL_TYPE(cgsl_vector), "collect!", 
-		   FUNCTION(rb_gsl_vector,collect_bang), 0);
+  rb_define_method(GSL_TYPE(cgsl_vector), "collect",
+                   FUNCTION(rb_gsl_vector,collect), 0);
+  rb_define_method(GSL_TYPE(cgsl_vector), "collect!",
+                   FUNCTION(rb_gsl_vector,collect_bang), 0);
   rb_define_alias(GSL_TYPE(cgsl_vector), "map", "collect");
   rb_define_alias(GSL_TYPE(cgsl_vector), "map!", "collect!");
 
   rb_define_method(GSL_TYPE(cgsl_vector), "to_m", FUNCTION(rb_gsl_vector,to_m), 2);
   rb_define_alias(GSL_TYPE(cgsl_vector), "to_matrix", "to_m");
   rb_define_alias(GSL_TYPE(cgsl_vector), "reshape", "to_m");
-  rb_define_method(GSL_TYPE(cgsl_vector), "to_m_diagonal", 
-		   FUNCTION(rb_gsl_vector,to_m_diagonal), 0);
-  rb_define_method(GSL_TYPE(cgsl_vector), "block", 
-		   FUNCTION(rb_gsl_vector,block), 0);
-  rb_define_method(GSL_TYPE(cgsl_vector), "to_m_circulant", 
-		   FUNCTION(rb_gsl_vector,to_m_circulant), 0);
-  rb_define_singleton_method(GSL_TYPE(cgsl_vector), "indgen", 
-			     FUNCTION(rb_gsl_vector,indgen_singleton), -1);
-  rb_define_method(GSL_TYPE(cgsl_vector), "indgen", 
-		   FUNCTION(rb_gsl_vector,indgen), -1);
-  rb_define_method(GSL_TYPE(cgsl_vector), "indgen!", 
-		   FUNCTION(rb_gsl_vector,indgen_bang), -1);
+  rb_define_method(GSL_TYPE(cgsl_vector), "to_m_diagonal",
+                   FUNCTION(rb_gsl_vector,to_m_diagonal), 0);
+  rb_define_method(GSL_TYPE(cgsl_vector), "block",
+                   FUNCTION(rb_gsl_vector,block), 0);
+  rb_define_method(GSL_TYPE(cgsl_vector), "to_m_circulant",
+                   FUNCTION(rb_gsl_vector,to_m_circulant), 0);
+  rb_define_singleton_method(GSL_TYPE(cgsl_vector), "indgen",
+                             FUNCTION(rb_gsl_vector,indgen_singleton), -1);
+  rb_define_method(GSL_TYPE(cgsl_vector), "indgen",
+                   FUNCTION(rb_gsl_vector,indgen), -1);
+  rb_define_method(GSL_TYPE(cgsl_vector), "indgen!",
+                   FUNCTION(rb_gsl_vector,indgen_bang), -1);
   /*****/
-  rb_define_method(GSL_TYPE(cgsl_vector), "sort!", 
-		   GSL_TYPE(rb_gsl_sort_vector), 0);
-  rb_define_method(GSL_TYPE(cgsl_vector), "sort", 
-		   GSL_TYPE(rb_gsl_sort_vector2), 0);
-  rb_define_method(GSL_TYPE(cgsl_vector), "sort_index", 
-		   FUNCTION(rb_gsl_sort_vector,index), 0);
+  rb_define_method(GSL_TYPE(cgsl_vector), "sort!",
+                   GSL_TYPE(rb_gsl_sort_vector), 0);
+  rb_define_method(GSL_TYPE(cgsl_vector), "sort",
+                   GSL_TYPE(rb_gsl_sort_vector2), 0);
+  rb_define_method(GSL_TYPE(cgsl_vector), "sort_index",
+                   FUNCTION(rb_gsl_sort_vector,index), 0);
   rb_define_method(GSL_TYPE(cgsl_vector), "sort_smallest",
-		   FUNCTION(rb_gsl_sort_vector,smallest), 1);
+                   FUNCTION(rb_gsl_sort_vector,smallest), 1);
   rb_define_alias(GSL_TYPE(cgsl_vector), "smallest", "sort_smallest");
   rb_define_method(GSL_TYPE(cgsl_vector), "sort_largest",
-		   FUNCTION(rb_gsl_sort_vector,largest), 1);
+                   FUNCTION(rb_gsl_sort_vector,largest), 1);
   rb_define_alias(GSL_TYPE(cgsl_vector), "largest", "sort_largest");
-  rb_define_method(GSL_TYPE(cgsl_vector), "sort_smallest_index", 
-		   FUNCTION(rb_gsl_sort_vector,smallest_index), 1);
+  rb_define_method(GSL_TYPE(cgsl_vector), "sort_smallest_index",
+                   FUNCTION(rb_gsl_sort_vector,smallest_index), 1);
   rb_define_alias(GSL_TYPE(cgsl_vector), "smallest_index", "sort_smallest_index");
-  rb_define_method(GSL_TYPE(cgsl_vector), "sort_largest_index", 
-		   FUNCTION(rb_gsl_sort_vector,largest_index), 1);
+  rb_define_method(GSL_TYPE(cgsl_vector), "sort_largest_index",
+                   FUNCTION(rb_gsl_sort_vector,largest_index), 1);
   rb_define_alias(GSL_TYPE(cgsl_vector), "largest_index", "sort_largest_index");
 
   /*****/
   rb_define_method(GSL_TYPE(cgsl_vector), "histogram",
-		   FUNCTION(rb_gsl_vector,histogram), -1);
-
-  rb_define_method(GSL_TYPE(cgsl_vector), "last", 
-		   FUNCTION(rb_gsl_vector,last), 0);
-  rb_define_method(GSL_TYPE(cgsl_vector), "first", 
-		   FUNCTION(rb_gsl_vector,first), 0);
-  rb_define_method(GSL_TYPE(cgsl_vector), "concat", 
-		   FUNCTION(rb_gsl_vector,concat), 1);
-
-  rb_define_method(GSL_TYPE(cgsl_vector), "diff", 
-		   FUNCTION(rb_gsl_vector,diff), -1);
-  rb_define_method(GSL_TYPE(cgsl_vector), "isnan", 
-		   FUNCTION(rb_gsl_vector,isnan), 0);
-  rb_define_method(GSL_TYPE(cgsl_vector), "isinf", 
-		   FUNCTION(rb_gsl_vector,isinf), 0);
-  rb_define_method(GSL_TYPE(cgsl_vector), "finite", 
-		   FUNCTION(rb_gsl_vector,finite), 0);
-
-  rb_define_method(GSL_TYPE(cgsl_vector), "isnan?", 
-		   FUNCTION(rb_gsl_vector,isnan2), 0);
-  rb_define_method(GSL_TYPE(cgsl_vector), "isinf?", 
-		   FUNCTION(rb_gsl_vector,isinf2), 0);
-  rb_define_method(GSL_TYPE(cgsl_vector), "finite?", 
-		   FUNCTION(rb_gsl_vector,finite2), 0);
-
-  rb_define_method(GSL_TYPE(cgsl_vector), "delete_at", 
-		   FUNCTION(rb_gsl_vector,delete_at), 1);
-  rb_define_method(GSL_TYPE(cgsl_vector), "delete_if", 
-		   FUNCTION(rb_gsl_vector,delete_if), 0);
-  rb_define_method(GSL_TYPE(cgsl_vector), "delete", 
-		   FUNCTION(rb_gsl_vector,delete), 1);
+                   FUNCTION(rb_gsl_vector,histogram), -1);
+
+  rb_define_method(GSL_TYPE(cgsl_vector), "last",
+                   FUNCTION(rb_gsl_vector,last), 0);
+  rb_define_method(GSL_TYPE(cgsl_vector), "first",
+                   FUNCTION(rb_gsl_vector,first), 0);
+  rb_define_method(GSL_TYPE(cgsl_vector), "concat",
+                   FUNCTION(rb_gsl_vector,concat), 1);
+
+  rb_define_method(GSL_TYPE(cgsl_vector), "diff",
+                   FUNCTION(rb_gsl_vector,diff), -1);
+  rb_define_method(GSL_TYPE(cgsl_vector), "isnan",
+                   FUNCTION(rb_gsl_vector,isnan), 0);
+  rb_define_method(GSL_TYPE(cgsl_vector), "isinf",
+                   FUNCTION(rb_gsl_vector,isinf), 0);
+  rb_define_method(GSL_TYPE(cgsl_vector), "finite",
+                   FUNCTION(rb_gsl_vector,finite), 0);
+
+  rb_define_method(GSL_TYPE(cgsl_vector), "isnan?",
+                   FUNCTION(rb_gsl_vector,isnan2), 0);
+  rb_define_method(GSL_TYPE(cgsl_vector), "isinf?",
+                   FUNCTION(rb_gsl_vector,isinf2), 0);
+  rb_define_method(GSL_TYPE(cgsl_vector), "finite?",
+                   FUNCTION(rb_gsl_vector,finite2), 0);
+
+  rb_define_method(GSL_TYPE(cgsl_vector), "delete_at",
+                   FUNCTION(rb_gsl_vector,delete_at), 1);
+  rb_define_method(GSL_TYPE(cgsl_vector), "delete_if",
+                   FUNCTION(rb_gsl_vector,delete_if), 0);
+  rb_define_method(GSL_TYPE(cgsl_vector), "delete",
+                   FUNCTION(rb_gsl_vector,delete), 1);
   /***/
   rb_define_singleton_method(GSL_TYPE(cgsl_vector), "filescan", FUNCTION(rb_gsl_vector,filescan), 1);
 
@@ -3295,9 +3285,9 @@ void FUNCTION(Init_gsl_vector,init)(VALUE module)
   rb_define_method(GSL_TYPE(cgsl_vector), "all?", FUNCTION(rb_gsl_vector,all), 0);
   rb_define_method(GSL_TYPE(cgsl_vector), "none?", FUNCTION(rb_gsl_vector,none), 0);
   rb_define_method(GSL_TYPE(cgsl_vector), "any",
-		   FUNCTION(rb_gsl_vector,any), 0);
+                   FUNCTION(rb_gsl_vector,any), 0);
   rb_define_method(GSL_TYPE(cgsl_vector), "any?",
-		   FUNCTION(rb_gsl_vector,any2), 0);
+                   FUNCTION(rb_gsl_vector,any2), 0);
 
   rb_define_method(GSL_TYPE(cgsl_vector), "where", FUNCTION(rb_gsl_vector,where), 0);
   rb_define_method(GSL_TYPE(cgsl_vector), "where2", FUNCTION(rb_gsl_vector,where2), 0);
@@ -3310,17 +3300,12 @@ void FUNCTION(Init_gsl_vector,init)(VALUE module)
   rb_define_singleton_method(GSL_TYPE(cgsl_vector), "zip", FUNCTION(rb_gsl_vector,zip), -1);
   rb_define_method(GSL_TYPE(cgsl_vector), "zip", FUNCTION(rb_gsl_vector,zip), -1);
   rb_define_method(GSL_TYPE(cgsl_vector), "join", FUNCTION(rb_gsl_vector,join), -1);
-#ifdef GSL_1_9_LATER
   rb_define_method(GSL_TYPE(cgsl_vector), "ispos", FUNCTION(rb_gsl_vector,ispos), 0);
   rb_define_method(GSL_TYPE(cgsl_vector), "ispos?", FUNCTION(rb_gsl_vector,ispos2), 0);
   rb_define_method(GSL_TYPE(cgsl_vector), "isneg", FUNCTION(rb_gsl_vector,isneg), 0);
   rb_define_method(GSL_TYPE(cgsl_vector), "isneg?", FUNCTION(rb_gsl_vector,isneg2), 0);
-#endif
-
-#ifdef GSL_1_10_LATER
   rb_define_method(GSL_TYPE(cgsl_vector), "isnonneg", FUNCTION(rb_gsl_vector,isnonneg), 0);
   rb_define_method(GSL_TYPE(cgsl_vector), "isnonneg?", FUNCTION(rb_gsl_vector,isnonneg2), 0);
-#endif
 }
 
 #undef NUMCONV