ruby-dcl 1.7.1 → 1.8.2

data/ext/numru/init.c.default

@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include "ruby.h"
-#include "libtinyf2c.h"
+#include "cdcl.h"
+#include "narray.h"
 
 /* for compatibility with ruby 1.6 */
 #ifndef RARRAY_PTR
@@ -72,7 +73,7 @@ void init_misc1_fmtlib(VALUE mDCL);
 void init_misc1_misclib(VALUE mDCL);
 void init_misc1_randlib(VALUE mDCL);
 void init_misc1_timelib(VALUE mDCL);
-
+void init_misc2_tmpack(VALUE mDCL);
 
 static int ruby_msgdmp_err_func(char *csub, char *cmsg, 
 			      int csub_len, int cmsg_len)
@@ -186,6 +187,9 @@ Init_dcl_raw()
     init_misc1_misclib(mDCL);
     init_misc1_randlib(mDCL);
     init_misc1_timelib(mDCL);
+#if DCLVER >= 730
+    init_misc2_tmpack(mDCL);
+#endif
 #if DCLVER >= 532
     rb_define_module_function(mDCL, "init_arg", dcl_init_arg, 2);
 #endif

data/ext/numru/math1_blklib.c

@@ -1,10 +1,9 @@
 /*
- * $Id: p_header,v 1.3 2015/03/18 03:27:42 horinout Exp $
+ * $Id$
  */
 
 #include <stdio.h>
 #include "ruby.h"
-#include "libtinyf2c.h"
 #include "narray.h"
 #include "cdcl.h"
 
@@ -15,6 +14,10 @@
 
 #define DFLT_SIZE 32
 
+#ifndef NARRAY_BIGMEM
+typedef int    na_shape_t;
+#endif
+
 extern char    *dcl_obj2ccharary(VALUE, int, int);
 extern integer *dcl_obj2cintegerary(VALUE);
 extern real    *dcl_obj2crealary(VALUE);
@@ -22,10 +25,10 @@ extern complex *dcl_obj2ccomplexary(VALUE);
 extern logical *dcl_obj2clogicalary(VALUE);
 
 extern VALUE dcl_ccharary2obj(char *, int, int);
-extern VALUE dcl_cintegerary2obj(integer *, int, int, int *);
-extern VALUE dcl_crealary2obj(real *, int, int, int *);
-extern VALUE dcl_ccomplexary2obj(complex *, int, char *);
-extern VALUE dcl_clogicalary2obj(logical *, int, int, int *);
+extern VALUE dcl_cintegerary2obj(integer *, na_shape_t, int, na_shape_t *);
+extern VALUE dcl_crealary2obj(real *, na_shape_t, int, na_shape_t *);
+/* extern VALUE dcl_ccomplexary2obj(complex *, int, char *); */
+extern VALUE dcl_clogicalary2obj(logical *, na_shape_t, int, na_shape_t *);
 
 extern void dcl_freeccharary(char *);
 extern void dcl_freecintegerary(integer *);
@@ -91,7 +94,7 @@ dcl_iblklt(obj, rx, n, rr)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = iblklt_(i_rx, &i_n, &i_rr);
+    o_rtn_val = iblklt__(i_rx, &i_n, &i_rr);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -130,7 +133,7 @@ dcl_iblkle(obj, rx, n, rr)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = iblkle_(i_rx, &i_n, &i_rr);
+    o_rtn_val = iblkle__(i_rx, &i_n, &i_rr);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -169,7 +172,7 @@ dcl_iblkgt(obj, rx, n, rr)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = iblkgt_(i_rx, &i_n, &i_rr);
+    o_rtn_val = iblkgt__(i_rx, &i_n, &i_rr);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -208,7 +211,7 @@ dcl_iblkge(obj, rx, n, rr)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = iblkge_(i_rx, &i_n, &i_rr);
+    o_rtn_val = iblkge__(i_rx, &i_n, &i_rr);
 
     rtn_val = INT2NUM(o_rtn_val);
 

data/ext/numru/math1_chrlib.c

@@ -1,10 +1,9 @@
 /*
- * $Id: p_header,v 1.3 2015/03/18 03:27:42 horinout Exp $
+ * $Id$
  */
 
 #include <stdio.h>
 #include "ruby.h"
-#include "libtinyf2c.h"
 #include "narray.h"
 #include "cdcl.h"
 
@@ -15,6 +14,10 @@
 
 #define DFLT_SIZE 32
 
+#ifndef NARRAY_BIGMEM
+typedef int    na_shape_t;
+#endif
+
 extern char    *dcl_obj2ccharary(VALUE, int, int);
 extern integer *dcl_obj2cintegerary(VALUE);
 extern real    *dcl_obj2crealary(VALUE);
@@ -22,10 +25,10 @@ extern complex *dcl_obj2ccomplexary(VALUE);
 extern logical *dcl_obj2clogicalary(VALUE);
 
 extern VALUE dcl_ccharary2obj(char *, int, int);
-extern VALUE dcl_cintegerary2obj(integer *, int, int, int *);
-extern VALUE dcl_crealary2obj(real *, int, int, int *);
-extern VALUE dcl_ccomplexary2obj(complex *, int, char *);
-extern VALUE dcl_clogicalary2obj(logical *, int, int, int *);
+extern VALUE dcl_cintegerary2obj(integer *, na_shape_t, int, na_shape_t *);
+extern VALUE dcl_crealary2obj(real *, na_shape_t, int, na_shape_t *);
+/* extern VALUE dcl_ccomplexary2obj(complex *, int, char *); */
+extern VALUE dcl_clogicalary2obj(logical *, na_shape_t, int, na_shape_t *);
 
 extern void dcl_freeccharary(char *);
 extern void dcl_freecintegerary(integer *);
@@ -76,7 +79,7 @@ dcl_cladj(obj, chr)
     strcpy(io_chr, StringValuePtr(chr));
 
 
-    cladj_(io_chr, (ftnlen)strlen(io_chr));
+    cladj__(io_chr, (ftnlen)strlen(io_chr));
 
     chr = rb_str_new2(io_chr);
 
@@ -100,7 +103,7 @@ dcl_lenb(obj, c)
     i_c = StringValuePtr(c);
 
 
-    o_rtn_val = lenb_(i_c, (ftnlen)strlen(i_c));
+    o_rtn_val = lenb__(i_c, (ftnlen)strlen(i_c));
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -124,7 +127,7 @@ dcl_lenc(obj, c)
     i_c = StringValuePtr(c);
 
 
-    o_rtn_val = lenc_(i_c, (ftnlen)strlen(i_c));
+    o_rtn_val = lenc__(i_c, (ftnlen)strlen(i_c));
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -148,7 +151,7 @@ dcl_leny(obj, c)
     i_c = StringValuePtr(c);
 
 
-    o_rtn_val = leny_(i_c, (ftnlen)strlen(i_c));
+    o_rtn_val = leny__(i_c, (ftnlen)strlen(i_c));
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -172,7 +175,7 @@ dcl_lenz(obj, c)
     i_c = StringValuePtr(c);
 
 
-    o_rtn_val = lenz_(i_c, (ftnlen)strlen(i_c));
+    o_rtn_val = lenz__(i_c, (ftnlen)strlen(i_c));
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -195,7 +198,7 @@ dcl_cradj(obj, chr)
     strcpy(io_chr, StringValuePtr(chr));
 
 
-    cradj_(io_chr, (ftnlen)strlen(io_chr));
+    cradj__(io_chr, (ftnlen)strlen(io_chr));
 
     chr = rb_str_new2(io_chr);
 
@@ -218,7 +221,7 @@ dcl_crvrs(obj, chr)
     strcpy(io_chr, StringValuePtr(chr));
 
 
-    crvrs_(io_chr, (ftnlen)strlen(io_chr));
+    crvrs__(io_chr, (ftnlen)strlen(io_chr));
 
     chr = rb_str_new2(io_chr);
 

data/ext/numru/math1_clsplib.c

@@ -1,10 +1,9 @@
 /*
- * $Id: p_header,v 1.3 2015/03/18 03:27:42 horinout Exp $
+ * $Id$
  */
 
 #include <stdio.h>
 #include "ruby.h"
-#include "libtinyf2c.h"
 #include "narray.h"
 #include "cdcl.h"
 
@@ -15,6 +14,10 @@
 
 #define DFLT_SIZE 32
 
+#ifndef NARRAY_BIGMEM
+typedef int    na_shape_t;
+#endif
+
 extern char    *dcl_obj2ccharary(VALUE, int, int);
 extern integer *dcl_obj2cintegerary(VALUE);
 extern real    *dcl_obj2crealary(VALUE);
@@ -22,10 +25,10 @@ extern complex *dcl_obj2ccomplexary(VALUE);
 extern logical *dcl_obj2clogicalary(VALUE);
 
 extern VALUE dcl_ccharary2obj(char *, int, int);
-extern VALUE dcl_cintegerary2obj(integer *, int, int, int *);
-extern VALUE dcl_crealary2obj(real *, int, int, int *);
-extern VALUE dcl_ccomplexary2obj(complex *, int, char *);
-extern VALUE dcl_clogicalary2obj(logical *, int, int, int *);
+extern VALUE dcl_cintegerary2obj(integer *, na_shape_t, int, na_shape_t *);
+extern VALUE dcl_crealary2obj(real *, na_shape_t, int, na_shape_t *);
+/* extern VALUE dcl_ccomplexary2obj(complex *, int, char *); */
+extern VALUE dcl_clogicalary2obj(logical *, na_shape_t, int, na_shape_t *);
 
 extern void dcl_freeccharary(char *);
 extern void dcl_freecintegerary(integer *);
@@ -118,7 +121,7 @@ dcl_clrgsv(obj, r, g, b, n, m)
     o_s= ALLOCA_N(real, (i_n*i_m));
     o_v= ALLOCA_N(real, (i_n*i_m));
 
-    clrgsv_(i_r, i_g, i_b, o_h, o_s, o_v, &i_n, &i_m);
+    clrgsv__(i_r, i_g, i_b, o_h, o_s, o_v, &i_n, &i_m);
 
     {int array_shape[2] = {i_n, i_m};
      h = dcl_crealary2obj(o_h, (i_n*i_m), 2, array_shape);
@@ -192,7 +195,7 @@ dcl_clsvrg(obj, h, s, v, n, m)
     o_g= ALLOCA_N(integer, (i_n*i_m));
     o_b= ALLOCA_N(integer, (i_n*i_m));
 
-    clsvrg_(i_h, i_s, i_v, o_r, o_g, o_b, &i_n, &i_m);
+    clsvrg__(i_h, i_s, i_v, o_r, o_g, o_b, &i_n, &i_m);
 
     {int array_shape[2] = {i_n, i_m};
      r = dcl_cintegerary2obj(o_r, (i_n*i_m), 2, array_shape);
@@ -252,7 +255,7 @@ dcl_inorml(obj, v, n, m, x, y)
 
     o_w= ALLOCA_N(real, (i_n*i_m));
 
-    inorml_(i_v, o_w, &i_n, &i_m, &i_x, &i_y);
+    inorml__(i_v, o_w, &i_n, &i_m, &i_x, &i_y);
 
     {int array_shape[2] = {i_n, i_m};
      w = dcl_crealary2obj(o_w, (i_n*i_m), 2, array_shape);
@@ -304,7 +307,7 @@ dcl_rnorml(obj, v, n, m, x, y)
 
     o_w= ALLOCA_N(real, (i_n*i_m));
 
-    rnorml_(i_v, o_w, &i_n, &i_m, &i_x, &i_y);
+    rnorml__(i_v, o_w, &i_n, &i_m, &i_x, &i_y);
 
     {int array_shape[2] = {i_n, i_m};
      w = dcl_crealary2obj(o_w, (i_n*i_m), 2, array_shape);

data/ext/numru/math1_fnclib.c

@@ -1,10 +1,9 @@
 /*
- * $Id: p_header,v 1.3 2015/03/18 03:27:42 horinout Exp $
+ * $Id$
  */
 
 #include <stdio.h>
 #include "ruby.h"
-#include "libtinyf2c.h"
 #include "narray.h"
 #include "cdcl.h"
 
@@ -15,6 +14,10 @@
 
 #define DFLT_SIZE 32
 
+#ifndef NARRAY_BIGMEM
+typedef int    na_shape_t;
+#endif
+
 extern char    *dcl_obj2ccharary(VALUE, int, int);
 extern integer *dcl_obj2cintegerary(VALUE);
 extern real    *dcl_obj2crealary(VALUE);
@@ -22,10 +25,10 @@ extern complex *dcl_obj2ccomplexary(VALUE);
 extern logical *dcl_obj2clogicalary(VALUE);
 
 extern VALUE dcl_ccharary2obj(char *, int, int);
-extern VALUE dcl_cintegerary2obj(integer *, int, int, int *);
-extern VALUE dcl_crealary2obj(real *, int, int, int *);
-extern VALUE dcl_ccomplexary2obj(complex *, int, char *);
-extern VALUE dcl_clogicalary2obj(logical *, int, int, int *);
+extern VALUE dcl_cintegerary2obj(integer *, na_shape_t, int, na_shape_t *);
+extern VALUE dcl_crealary2obj(real *, na_shape_t, int, na_shape_t *);
+/* extern VALUE dcl_ccomplexary2obj(complex *, int, char *); */
+extern VALUE dcl_clogicalary2obj(logical *, na_shape_t, int, na_shape_t *);
 
 extern void dcl_freeccharary(char *);
 extern void dcl_freecintegerary(integer *);
@@ -77,7 +80,7 @@ dcl_igus(obj, rx)
     i_rx = (real)NUM2DBL(rx);
 
 
-    o_rtn_val = igus_(&i_rx);
+    o_rtn_val = igus__(&i_rx);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -106,7 +109,7 @@ dcl_imod(obj, ix, id)
     i_id = NUM2INT(id);
 
 
-    o_rtn_val = imod_(&i_ix, &i_id);
+    o_rtn_val = imod__(&i_ix, &i_id);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -135,7 +138,7 @@ dcl_rmod(obj, rx, rd)
     i_rd = (real)NUM2DBL(rd);
 
 
-    o_rtn_val = rmod_(&i_rx, &i_rd);
+    o_rtn_val = rmod__(&i_rx, &i_rd);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -169,7 +172,7 @@ dcl_rexp(obj, rx, ib, ie)
     i_ie = NUM2INT(ie);
 
 
-    o_rtn_val = rexp_(&i_rx, &i_ib, &i_ie);
+    o_rtn_val = rexp__(&i_rx, &i_ib, &i_ie);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -193,7 +196,7 @@ dcl_rd2r(obj, x)
     i_x = (real)NUM2DBL(x);
 
 
-    o_rtn_val = rd2r_(&i_x);
+    o_rtn_val = rd2r__(&i_x);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -217,7 +220,7 @@ dcl_rr2d(obj, x)
     i_x = (real)NUM2DBL(x);
 
 
-    o_rtn_val = rr2d_(&i_x);
+    o_rtn_val = rr2d__(&i_x);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -233,7 +236,7 @@ dcl_rfpi(obj)
     real o_rtn_val;
     VALUE rtn_val;
 
-    o_rtn_val = rfpi_();
+    o_rtn_val = rfpi__();
 
     rtn_val = rb_float_new((double)o_rtn_val);
 

data/ext/numru/math1_gnmlib.c

@@ -1,10 +1,9 @@
 /*
- * $Id: p_header,v 1.3 2015/03/18 03:27:42 horinout Exp $
+ * $Id$
  */
 
 #include <stdio.h>
 #include "ruby.h"
-#include "libtinyf2c.h"
 #include "narray.h"
 #include "cdcl.h"
 
@@ -15,6 +14,10 @@
 
 #define DFLT_SIZE 32
 
+#ifndef NARRAY_BIGMEM
+typedef int    na_shape_t;
+#endif
+
 extern char    *dcl_obj2ccharary(VALUE, int, int);
 extern integer *dcl_obj2cintegerary(VALUE);
 extern real    *dcl_obj2crealary(VALUE);
@@ -22,10 +25,10 @@ extern complex *dcl_obj2ccomplexary(VALUE);
 extern logical *dcl_obj2clogicalary(VALUE);
 
 extern VALUE dcl_ccharary2obj(char *, int, int);
-extern VALUE dcl_cintegerary2obj(integer *, int, int, int *);
-extern VALUE dcl_crealary2obj(real *, int, int, int *);
-extern VALUE dcl_ccomplexary2obj(complex *, int, char *);
-extern VALUE dcl_clogicalary2obj(logical *, int, int, int *);
+extern VALUE dcl_cintegerary2obj(integer *, na_shape_t, int, na_shape_t *);
+extern VALUE dcl_crealary2obj(real *, na_shape_t, int, na_shape_t *);
+/* extern VALUE dcl_ccomplexary2obj(complex *, int, char *); */
+extern VALUE dcl_clogicalary2obj(logical *, na_shape_t, int, na_shape_t *);
 
 extern void dcl_freeccharary(char *);
 extern void dcl_freecintegerary(integer *);
@@ -66,7 +69,7 @@ static VALUE
 dcl_gnsave(obj)
     VALUE obj;
 {
-    gnsave_();
+    gnsave__();
 
     return Qnil;
 
@@ -76,7 +79,7 @@ static VALUE
 dcl_gnrset(obj)
     VALUE obj;
 {
-    gnrset_();
+    gnrset__();
 
     return Qnil;
 
@@ -104,7 +107,7 @@ dcl_gnsblk(obj, xb, nb)
     i_xb = dcl_obj2crealary(xb);
 
 
-    gnsblk_(i_xb, &i_nb);
+    gnsblk__(i_xb, &i_nb);
 
     dcl_freecrealary(i_xb);
 
@@ -123,7 +126,7 @@ dcl_gnqblk(obj)
 
     o_xb= ALLOCA_N(real, (o_nb));
 
-    gnqblk_(o_xb, &o_nb);
+    gnqblk__(o_xb, &o_nb);
 
     {int array_shape[1] = {o_nb};
      xb = dcl_crealary2obj(o_xb, (o_nb), 1, array_shape);
@@ -152,7 +155,7 @@ dcl_gnlt(obj, rx)
     i_rx = (real)NUM2DBL(rx);
 
 
-    gnlt_(&i_rx, &o_bx, &o_ip);
+    gnlt__(&i_rx, &o_bx, &o_ip);
 
     bx = rb_float_new((double)o_bx);
     ip = INT2NUM(o_ip);
@@ -179,7 +182,7 @@ dcl_gnle(obj, rx)
     i_rx = (real)NUM2DBL(rx);
 
 
-    gnle_(&i_rx, &o_bx, &o_ip);
+    gnle__(&i_rx, &o_bx, &o_ip);
 
     bx = rb_float_new((double)o_bx);
     ip = INT2NUM(o_ip);
@@ -206,7 +209,7 @@ dcl_gngt(obj, rx)
     i_rx = (real)NUM2DBL(rx);
 
 
-    gngt_(&i_rx, &o_bx, &o_ip);
+    gngt__(&i_rx, &o_bx, &o_ip);
 
     bx = rb_float_new((double)o_bx);
     ip = INT2NUM(o_ip);
@@ -233,7 +236,7 @@ dcl_gnge(obj, rx)
     i_rx = (real)NUM2DBL(rx);
 
 
-    gnge_(&i_rx, &o_bx, &o_ip);
+    gnge__(&i_rx, &o_bx, &o_ip);
 
     bx = rb_float_new((double)o_bx);
     ip = INT2NUM(o_ip);
@@ -258,7 +261,7 @@ dcl_rgnlt(obj, rx)
     i_rx = (real)NUM2DBL(rx);
 
 
-    o_rtn_val = rgnlt_(&i_rx);
+    o_rtn_val = rgnlt__(&i_rx);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -282,7 +285,7 @@ dcl_rgnle(obj, rx)
     i_rx = (real)NUM2DBL(rx);
 
 
-    o_rtn_val = rgnle_(&i_rx);
+    o_rtn_val = rgnle__(&i_rx);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -306,7 +309,7 @@ dcl_rgnge(obj, rx)
     i_rx = (real)NUM2DBL(rx);
 
 
-    o_rtn_val = rgnge_(&i_rx);
+    o_rtn_val = rgnge__(&i_rx);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -330,7 +333,7 @@ dcl_rgngt(obj, rx)
     i_rx = (real)NUM2DBL(rx);
 
 
-    o_rtn_val = rgngt_(&i_rx);
+    o_rtn_val = rgngt__(&i_rx);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 

data/ext/numru/math1_gt2dlib.c

@@ -1,10 +1,9 @@
 /*
- * $Id: p_header,v 1.3 2015/03/18 03:27:42 horinout Exp $
+ * $Id$
  */
 
 #include <stdio.h>
 #include "ruby.h"
-#include "libtinyf2c.h"
 #include "narray.h"
 #include "cdcl.h"
 
@@ -15,6 +14,10 @@
 
 #define DFLT_SIZE 32
 
+#ifndef NARRAY_BIGMEM
+typedef int    na_shape_t;
+#endif
+
 extern char    *dcl_obj2ccharary(VALUE, int, int);
 extern integer *dcl_obj2cintegerary(VALUE);
 extern real    *dcl_obj2crealary(VALUE);
@@ -22,10 +25,10 @@ extern complex *dcl_obj2ccomplexary(VALUE);
 extern logical *dcl_obj2clogicalary(VALUE);
 
 extern VALUE dcl_ccharary2obj(char *, int, int);
-extern VALUE dcl_cintegerary2obj(integer *, int, int, int *);
-extern VALUE dcl_crealary2obj(real *, int, int, int *);
-extern VALUE dcl_ccomplexary2obj(complex *, int, char *);
-extern VALUE dcl_clogicalary2obj(logical *, int, int, int *);
+extern VALUE dcl_cintegerary2obj(integer *, na_shape_t, int, na_shape_t *);
+extern VALUE dcl_crealary2obj(real *, na_shape_t, int, na_shape_t *);
+/* extern VALUE dcl_ccomplexary2obj(complex *, int, char *); */
+extern VALUE dcl_clogicalary2obj(logical *, na_shape_t, int, na_shape_t *);
 
 extern void dcl_freeccharary(char *);
 extern void dcl_freecintegerary(integer *);
@@ -104,7 +107,7 @@ dcl_g2fbli(obj, p, q, z00, z10, z01, z11)
     i_z11 = (real)NUM2DBL(z11);
 
 
-    g2fbli_(&i_p, &i_q, &i_z00, &i_z10, &i_z01, &i_z11, &o_z);
+    g2fbli__(&i_p, &i_q, &i_z00, &i_z10, &i_z01, &i_z11, &o_z);
 
     z = rb_float_new((double)o_z);
 
@@ -175,7 +178,7 @@ dcl_g2fbl2(obj, p, q, x00, x10, x01, x11, y00, y10, y01, y11)
     i_y11 = (real)NUM2DBL(y11);
 
 
-    g2fbl2_(&i_p, &i_q, &i_x00, &i_x10, &i_x01, &i_x11, &i_y00, &i_y10, &i_y01, &i_y11, &o_x, &o_y);
+    g2fbl2__(&i_p, &i_q, &i_x00, &i_x10, &i_x01, &i_x11, &i_y00, &i_y10, &i_y01, &i_y11, &o_x, &o_y);
 
     x = rb_float_new((double)o_x);
     y = rb_float_new((double)o_y);
@@ -247,7 +250,7 @@ dcl_g2ibl2(obj, x, y, x00, x10, x01, x11, y00, y10, y01, y11)
     i_y11 = (real)NUM2DBL(y11);
 
 
-    g2ibl2_(&i_x, &i_y, &i_x00, &i_x10, &i_x01, &i_x11, &i_y00, &i_y10, &i_y01, &i_y11, &o_p, &o_q);
+    g2ibl2__(&i_x, &i_y, &i_x00, &i_x10, &i_x01, &i_x11, &i_y00, &i_y10, &i_y01, &i_y11, &o_p, &o_q);
 
     p = rb_float_new((double)o_p);
     q = rb_float_new((double)o_q);
@@ -279,7 +282,7 @@ dcl_g2fctr(obj, ux, uy)
     i_uy = (real)NUM2DBL(uy);
 
 
-    g2fctr_(&i_ux, &i_uy, &o_cx, &o_cy);
+    g2fctr__(&i_ux, &i_uy, &o_cx, &o_cy);
 
     cx = rb_float_new((double)o_cx);
     cy = rb_float_new((double)o_cy);
@@ -311,7 +314,7 @@ dcl_g2ictr(obj, cx, cy)
     i_cy = (real)NUM2DBL(cy);
 
 
-    g2ictr_(&i_cx, &i_cy, &o_ux, &o_uy);
+    g2ictr__(&i_cx, &i_cy, &o_ux, &o_uy);
 
     ux = rb_float_new((double)o_ux);
     uy = rb_float_new((double)o_uy);
@@ -328,7 +331,7 @@ dcl_g2qcti(obj)
     logical o_lini;
     VALUE lini;
 
-    g2qcti_(&o_lini);
+    g2qcti__(&o_lini);
 
     lini = (o_lini == FALSE_) ? Qfalse : Qtrue;
 
@@ -350,7 +353,7 @@ dcl_g2qctm(obj)
     VALUE cymine;
     VALUE cymaxe;
 
-    g2qctm_(&o_cxmine, &o_cxmaxe, &o_cymine, &o_cymaxe);
+    g2qctm__(&o_cxmine, &o_cxmaxe, &o_cymine, &o_cymaxe);
 
     cxmine = rb_float_new((double)o_cxmine);
     cxmaxe = rb_float_new((double)o_cxmaxe);
@@ -416,7 +419,7 @@ dcl_g2sctr(obj, nx, ny, uxa, uya, cxa, cya)
     i_cya = dcl_obj2crealary(cya);
 
 
-    g2sctr_(&i_nx, &i_ny, i_uxa, i_uya, i_cxa, i_cya);
+    g2sctr__(&i_nx, &i_ny, i_uxa, i_uya, i_cxa, i_cya);
 
     dcl_freecrealary(i_uxa);
     dcl_freecrealary(i_uya);
@@ -487,7 +490,7 @@ dcl_lg2inq(obj, cx, cy, cx00, cx10, cx01, cx11, cy00, cy10, cy01, cy11)
     i_cy11 = (real)NUM2DBL(cy11);
 
 
-    o_rtn_val = lg2inq_(&i_cx, &i_cy, &i_cx00, &i_cx10, &i_cx01, &i_cx11, &i_cy00, &i_cy10, &i_cy01, &i_cy11);
+    o_rtn_val = lg2inq__(&i_cx, &i_cy, &i_cx00, &i_cx10, &i_cx01, &i_cx11, &i_cy00, &i_cy10, &i_cy01, &i_cy11);
 
     rtn_val = (o_rtn_val == FALSE_) ? Qfalse : Qtrue;