i made you a patch, but i omitted it.

from rpe@, ok jeremy@
committing now so nobody else wastes 15Gb on pointless logfiles
This commit is contained in:
jasper 2014-09-24 22:17:39 +00:00
parent e8aa5b912e
commit 9c95ce5e4b
4 changed files with 48 additions and 48 deletions

View File

@ -0,0 +1,24 @@
$OpenBSD: patch-ext_gsl_matrix_complex_c,v 1.1 2014/09/24 22:17:39 jasper Exp $
Fix conflicting types.
--- ext/gsl/matrix_complex.c.orig Wed Sep 24 23:35:23 2014
+++ ext/gsl/matrix_complex.c Wed Sep 24 23:36:15 2014
@@ -1524,7 +1524,7 @@ static VALUE rb_gsl_matrix_complex_indgen_singleton(in
// Starting with version 1.15, GSL provides a gsl_matrix_complex_equal
// function, but it only determines absolute equality (i.e. is has no epsilon
// argument).
-static int gsl_matrix_complex_equal_eps(const gsl_matrix_complex *m1,
+static int gsl_matrix_complex_equal_with_eps(const gsl_matrix_complex *m1,
const gsl_matrix_complex *m2, double eps)
{
gsl_complex z1, z2;
@@ -1559,7 +1559,7 @@ static VALUE rb_gsl_matrix_complex_equal(int argc, VAL
Data_Get_Struct(obj, gsl_matrix_complex, m1);
CHECK_MATRIX_COMPLEX(argv[0]);
Data_Get_Struct(argv[0], gsl_matrix_complex, m2);
- ret = gsl_matrix_complex_equal_eps(m1, m2, eps);
+ ret = gsl_matrix_complex_equal_with_eps(m1, m2, eps);
if (ret == 1) return Qtrue;
else return Qfalse;
}

View File

@ -0,0 +1,24 @@
$OpenBSD: patch-ext_gsl_vector_complex_c,v 1.1 2014/09/24 22:17:39 jasper Exp $
Fix conflicting types.
--- ext/gsl/vector_complex.c.orig Wed Sep 24 23:37:48 2014
+++ ext/gsl/vector_complex.c Wed Sep 24 23:38:35 2014
@@ -1990,7 +1990,7 @@ static VALUE rb_gsl_vector_complex_zip(int argc, VALUE
// Starting with version 1.15, GSL provides a gsl_vector_complex_equal
// function, but it only determines absolute equality (i.e. is has no epsilon
// argument).
-static int gsl_vector_complex_equal_eps(const gsl_vector_complex *v1,
+static int gsl_vector_complex_equal_with_eps(const gsl_vector_complex *v1,
const gsl_vector_complex *v2, double eps)
{
gsl_complex z1, z2;
@@ -2023,7 +2023,7 @@ static VALUE rb_gsl_vector_complex_equal(int argc, VAL
Data_Get_Struct(obj, gsl_vector_complex, v1);
CHECK_VECTOR_COMPLEX(argv[0]);
Data_Get_Struct(argv[0], gsl_vector_complex, v2);
- ret = gsl_vector_complex_equal_eps(v1, v2, eps);
+ ret = gsl_vector_complex_equal_with_eps(v1, v2, eps);
if (ret == 1) return Qtrue;
else return Qfalse;
}

View File

@ -1,24 +0,0 @@
$OpenBSD: patch-ext_matrix_complex_c,v 1.1.1.1 2013/01/18 17:07:33 jasper Exp $
Fix conflicting types.
--- ext/matrix_complex.c.orig Fri Jan 18 10:52:52 2013
+++ ext/matrix_complex.c Fri Jan 18 10:53:51 2013
@@ -1520,7 +1520,7 @@ static VALUE rb_gsl_matrix_complex_indgen_singleton(in
}
-static int gsl_matrix_complex_equal(const gsl_matrix_complex *m1,
+static int gsl_matrix_complex_equal_with_eps(const gsl_matrix_complex *m1,
const gsl_matrix_complex *m2, double eps)
{
gsl_complex z1, z2;
@@ -1555,7 +1555,7 @@ static VALUE rb_gsl_matrix_complex_equal(int argc, VAL
Data_Get_Struct(obj, gsl_matrix_complex, m1);
CHECK_MATRIX_COMPLEX(argv[0]);
Data_Get_Struct(argv[0], gsl_matrix_complex, m2);
- ret = gsl_matrix_complex_equal(m1, m2, eps);
+ ret = gsl_matrix_complex_equal_with_eps(m1, m2, eps);
if (ret == 1) return Qtrue;
else return Qfalse;
}

View File

@ -1,24 +0,0 @@
$OpenBSD: patch-ext_vector_complex_c,v 1.1.1.1 2013/01/18 17:07:33 jasper Exp $
Fix conflicting types.
--- ext/vector_complex.c.orig Fri Jan 18 10:53:55 2013
+++ ext/vector_complex.c Fri Jan 18 10:54:32 2013
@@ -1986,7 +1986,7 @@ static VALUE rb_gsl_vector_complex_zip(int argc, VALUE
return ary;
}
-static int gsl_vector_complex_equal(const gsl_vector_complex *v1,
+static int gsl_vector_complex_equal_with_eps(const gsl_vector_complex *v1,
const gsl_vector_complex *v2, double eps)
{
gsl_complex z1, z2;
@@ -2019,7 +2019,7 @@ static VALUE rb_gsl_vector_complex_equal(int argc, VAL
Data_Get_Struct(obj, gsl_vector_complex, v1);
CHECK_VECTOR_COMPLEX(argv[0]);
Data_Get_Struct(argv[0], gsl_vector_complex, v2);
- ret = gsl_vector_complex_equal(v1, v2, eps);
+ ret = gsl_vector_complex_equal_with_eps(v1, v2, eps);
if (ret == 1) return Qtrue;
else return Qfalse;
}