ruby-dcl 1.7.1 → 1.8.2

data/ext/numru/grph2_uypack.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 *);
@@ -80,7 +83,7 @@ dcl_uysaxz(obj, cside, roffy)
     i_roffy = (real)NUM2DBL(roffy);
 
 
-    uysaxz_(i_cside, &i_roffy, (ftnlen)strlen(i_cside));
+    uysaxz__(i_cside, &i_roffy, (ftnlen)strlen(i_cside));
 
     return Qnil;
 
@@ -99,7 +102,7 @@ dcl_uysaxs(obj, cside)
     i_cside = StringValuePtr(cside);
 
 
-    uysaxs_(i_cside, (ftnlen)strlen(i_cside));
+    uysaxs__(i_cside, (ftnlen)strlen(i_cside));
 
     return Qnil;
 
@@ -123,7 +126,7 @@ dcl_uypaxs(obj, cside, islct)
     i_islct = NUM2INT(islct);
 
 
-    uypaxs_(i_cside, &i_islct, (ftnlen)strlen(i_cside));
+    uypaxs__(i_cside, &i_islct, (ftnlen)strlen(i_cside));
 
     return Qnil;
 
@@ -161,7 +164,7 @@ dcl_uyptmk(obj, cside, islct, uy, n)
     i_uy = dcl_obj2crealary(uy);
 
 
-    uyptmk_(i_cside, &i_islct, i_uy, &i_n, (ftnlen)strlen(i_cside));
+    uyptmk__(i_cside, &i_islct, i_uy, &i_n, (ftnlen)strlen(i_cside));
 
     dcl_freecrealary(i_uy);
 
@@ -214,7 +217,7 @@ dcl_uyplbl(obj, cside, islct, uy, ch, nc, n)
     i_ch = dcl_obj2ccharary(ch, (i_n*DFLT_SIZE), DFLT_SIZE);
 
 
-    uyplbl_(i_cside, &i_islct, i_uy, i_ch, &i_nc, &i_n, (ftnlen)strlen(i_cside), (ftnlen)DFLT_SIZE);
+    uyplbl__(i_cside, &i_islct, i_uy, i_ch, &i_nc, &i_n, (ftnlen)strlen(i_cside), (ftnlen)DFLT_SIZE);
 
     dcl_freecrealary(i_uy);
     dcl_freeccharary(i_ch);
@@ -255,7 +258,7 @@ dcl_uypnum(obj, cside, islct, uy, n)
     i_uy = dcl_obj2crealary(uy);
 
 
-    uypnum_(i_cside, &i_islct, i_uy, &i_n, (ftnlen)strlen(i_cside));
+    uypnum__(i_cside, &i_islct, i_uy, &i_n, (ftnlen)strlen(i_cside));
 
     dcl_freecrealary(i_uy);
 
@@ -291,7 +294,7 @@ dcl_uypttl(obj, cside, islct, cttl, px)
     i_px = (real)NUM2DBL(px);
 
 
-    uypttl_(i_cside, &i_islct, i_cttl, &i_px, (ftnlen)strlen(i_cside), (ftnlen)strlen(i_cttl));
+    uypttl__(i_cside, &i_islct, i_cttl, &i_px, (ftnlen)strlen(i_cside), (ftnlen)strlen(i_cttl));
 
     return Qnil;
 
@@ -351,7 +354,7 @@ dcl_uyaxlb(obj, cside, uy1, n1, uy2, ch, nc, n2)
     i_ch = dcl_obj2ccharary(ch, (i_n2*DFLT_SIZE), DFLT_SIZE);
 
 
-    uyaxlb_(i_cside, i_uy1, &i_n1, i_uy2, i_ch, &i_nc, &i_n2, (ftnlen)strlen(i_cside), (ftnlen)DFLT_SIZE);
+    uyaxlb__(i_cside, i_uy1, &i_n1, i_uy2, i_ch, &i_nc, &i_n2, (ftnlen)strlen(i_cside), (ftnlen)DFLT_SIZE);
 
     dcl_freecrealary(i_uy1);
     dcl_freecrealary(i_uy2);
@@ -402,7 +405,7 @@ dcl_uyaxnm(obj, cside, uy1, n1, uy2, n2)
     i_uy2 = dcl_obj2crealary(uy2);
 
 
-    uyaxnm_(i_cside, i_uy1, &i_n1, i_uy2, &i_n2, (ftnlen)strlen(i_cside));
+    uyaxnm__(i_cside, i_uy1, &i_n1, i_uy2, &i_n2, (ftnlen)strlen(i_cside));
 
     dcl_freecrealary(i_uy1);
     dcl_freecrealary(i_uy2);
@@ -434,7 +437,7 @@ dcl_uyaxdv(obj, cside, dy1, dy2)
     i_dy2 = (real)NUM2DBL(dy2);
 
 
-    uyaxdv_(i_cside, &i_dy1, &i_dy2, (ftnlen)strlen(i_cside));
+    uyaxdv__(i_cside, &i_dy1, &i_dy2, (ftnlen)strlen(i_cside));
 
     return Qnil;
 
@@ -463,7 +466,7 @@ dcl_uymttl(obj, cside, cttl, px)
     i_px = (real)NUM2DBL(px);
 
 
-    uymttl_(i_cside, i_cttl, &i_px, (ftnlen)strlen(i_cside), (ftnlen)strlen(i_cttl));
+    uymttl__(i_cside, i_cttl, &i_px, (ftnlen)strlen(i_cside), (ftnlen)strlen(i_cttl));
 
     return Qnil;
 
@@ -492,7 +495,7 @@ dcl_uysttl(obj, cside, cttl, px)
     i_px = (real)NUM2DBL(px);
 
 
-    uysttl_(i_cside, i_cttl, &i_px, (ftnlen)strlen(i_cside), (ftnlen)strlen(i_cttl));
+    uysttl__(i_cside, i_cttl, &i_px, (ftnlen)strlen(i_cside), (ftnlen)strlen(i_cttl));
 
     return Qnil;
 
@@ -511,7 +514,7 @@ dcl_uysfmt(obj, cfmt)
     i_cfmt = StringValuePtr(cfmt);
 
 
-    uysfmt_(i_cfmt, (ftnlen)strlen(i_cfmt));
+    uysfmt__(i_cfmt, (ftnlen)strlen(i_cfmt));
 
     return Qnil;
 
@@ -527,7 +530,7 @@ dcl_uyqfmt(obj)
     o_cfmt= ALLOCA_N(char, (DFLT_SIZE+1));
     memset(o_cfmt, '\0', DFLT_SIZE+1);
 
-    uyqfmt_(o_cfmt, (ftnlen)DFLT_SIZE);
+    uyqfmt__(o_cfmt, (ftnlen)DFLT_SIZE);
 
     cfmt = rb_str_new2(o_cfmt);
 

data/ext/numru/grph2_uzpack.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 *);
@@ -69,7 +72,7 @@ dcl_uzpqnp(obj)
     integer o_ncp;
     VALUE ncp;
 
-    uzpqnp_(&o_ncp);
+    uzpqnp__(&o_ncp);
 
     ncp = INT2NUM(o_ncp);
 
@@ -93,7 +96,7 @@ dcl_uzpqid(obj, cp)
     i_cp = StringValuePtr(cp);
 
 
-    uzpqid_(i_cp, &o_idx, (ftnlen)strlen(i_cp));
+    uzpqid__(i_cp, &o_idx, (ftnlen)strlen(i_cp));
 
     idx = INT2NUM(o_idx);
 
@@ -119,7 +122,7 @@ dcl_uzpqcp(obj, idx)
     o_cp= ALLOCA_N(char, (DFLT_SIZE+1));
     memset(o_cp, '\0', DFLT_SIZE+1);
 
-    uzpqcp_(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
+    uzpqcp__(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
 
     cp = rb_str_new2(o_cp);
 
@@ -145,7 +148,7 @@ dcl_uzpqcl(obj, idx)
     o_cp= ALLOCA_N(char, (DFLT_SIZE+1));
     memset(o_cp, '\0', DFLT_SIZE+1);
 
-    uzpqcl_(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
+    uzpqcl__(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
 
     cp = rb_str_new2(o_cp);
 
@@ -169,7 +172,7 @@ dcl_uzpqit(obj, idx)
     i_idx = NUM2INT(idx);
 
 
-    uzpqit_(&i_idx, &o_itp);
+    uzpqit__(&i_idx, &o_itp);
 
     itp = INT2NUM(o_itp);
 
@@ -193,7 +196,7 @@ dcl_uzpqvl(obj, idx)
     i_idx = NUM2INT(idx);
 
 
-    uzpqvl_(&i_idx, &o_ipara);
+    uzpqvl__(&i_idx, &o_ipara);
 
     ipara = INT2NUM(o_ipara);
 
@@ -220,7 +223,7 @@ dcl_uzpsvl(obj, idx, ipara)
     i_ipara = NUM2INT(ipara);
 
 
-    uzpsvl_(&i_idx, &i_ipara);
+    uzpsvl__(&i_idx, &i_ipara);
 
     return Qnil;
 
@@ -241,7 +244,7 @@ dcl_uzpqin(obj, cp)
     i_cp = StringValuePtr(cp);
 
 
-    uzpqin_(i_cp, &o_in, (ftnlen)strlen(i_cp));
+    uzpqin__(i_cp, &o_in, (ftnlen)strlen(i_cp));
 
     in = INT2NUM(o_in);
 
@@ -254,7 +257,7 @@ static VALUE
 dcl_uzinit(obj)
     VALUE obj;
 {
-    uzinit_();
+    uzinit__();
 
     return Qnil;
 
@@ -273,7 +276,7 @@ dcl_uzfact(obj, rfact)
     i_rfact = (real)NUM2DBL(rfact);
 
 
-    uzfact_(&i_rfact);
+    uzfact__(&i_rfact);
 
     return Qnil;
 
@@ -296,7 +299,7 @@ dcl_uzcget(obj, cp)
     o_cpara= ALLOCA_N(char, (DFLT_SIZE+1));
     memset(o_cpara, '\0', DFLT_SIZE+1);
 
-    uzcget_(i_cp, o_cpara, (ftnlen)strlen(i_cp), (ftnlen)DFLT_SIZE);
+    uzcget__(i_cp, o_cpara, (ftnlen)strlen(i_cp), (ftnlen)DFLT_SIZE);
 
     cpara = rb_str_new2(o_cpara);
 
@@ -323,7 +326,7 @@ dcl_uzcset(obj, cp, cpara)
     i_cpara = StringValuePtr(cpara);
 
 
-    uzcset_(i_cp, i_cpara, (ftnlen)strlen(i_cp), (ftnlen)strlen(i_cpara));
+    uzcset__(i_cp, i_cpara, (ftnlen)strlen(i_cp), (ftnlen)strlen(i_cpara));
 
     return Qnil;
 
@@ -347,7 +350,7 @@ dcl_uzcstx(obj, cp, cpara)
     i_cpara = StringValuePtr(cpara);
 
 
-    uzcstx_(i_cp, i_cpara, (ftnlen)strlen(i_cp), (ftnlen)strlen(i_cpara));
+    uzcstx__(i_cp, i_cpara, (ftnlen)strlen(i_cp), (ftnlen)strlen(i_cpara));
 
     return Qnil;
 
@@ -360,7 +363,7 @@ dcl_uzcqnp(obj)
     integer o_ncp;
     VALUE ncp;
 
-    uzcqnp_(&o_ncp);
+    uzcqnp__(&o_ncp);
 
     ncp = INT2NUM(o_ncp);
 
@@ -384,7 +387,7 @@ dcl_uzcqid(obj, cp)
     i_cp = StringValuePtr(cp);
 
 
-    uzcqid_(i_cp, &o_idx, (ftnlen)strlen(i_cp));
+    uzcqid__(i_cp, &o_idx, (ftnlen)strlen(i_cp));
 
     idx = INT2NUM(o_idx);
 
@@ -410,7 +413,7 @@ dcl_uzcqcp(obj, idx)
     o_cp= ALLOCA_N(char, (DFLT_SIZE+1));
     memset(o_cp, '\0', DFLT_SIZE+1);
 
-    uzcqcp_(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
+    uzcqcp__(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
 
     cp = rb_str_new2(o_cp);
 
@@ -436,7 +439,7 @@ dcl_uzcqcl(obj, idx)
     o_cp= ALLOCA_N(char, (DFLT_SIZE+1));
     memset(o_cp, '\0', DFLT_SIZE+1);
 
-    uzcqcl_(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
+    uzcqcl__(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
 
     cp = rb_str_new2(o_cp);
 
@@ -462,7 +465,7 @@ dcl_uzcqvl(obj, idx)
     o_cval= ALLOCA_N(char, (DFLT_SIZE+1));
     memset(o_cval, '\0', DFLT_SIZE+1);
 
-    uzcqvl_(&i_idx, o_cval, (ftnlen)DFLT_SIZE);
+    uzcqvl__(&i_idx, o_cval, (ftnlen)DFLT_SIZE);
 
     cval = rb_str_new2(o_cval);
 
@@ -489,7 +492,7 @@ dcl_uzcsvl(obj, idx, cval)
     i_cval = StringValuePtr(cval);
 
 
-    uzcsvl_(&i_idx, i_cval, (ftnlen)strlen(i_cval));
+    uzcsvl__(&i_idx, i_cval, (ftnlen)strlen(i_cval));
 
     return Qnil;
 
@@ -510,7 +513,7 @@ dcl_uzcqin(obj, cp)
     i_cp = StringValuePtr(cp);
 
 
-    uzcqin_(i_cp, &o_in, (ftnlen)strlen(i_cp));
+    uzcqin__(i_cp, &o_in, (ftnlen)strlen(i_cp));
 
     in = INT2NUM(o_in);
 
@@ -532,7 +535,7 @@ dcl_uzcsav(obj, iu)
     i_iu = NUM2INT(iu);
 
 
-    uzcsav_(&i_iu);
+    uzcsav__(&i_iu);
 
     return Qnil;
 
@@ -551,7 +554,7 @@ dcl_uzcrst(obj, iu)
     i_iu = NUM2INT(iu);
 
 
-    uzcrst_(&i_iu);
+    uzcrst__(&i_iu);
 
     return Qnil;
 
@@ -572,7 +575,7 @@ dcl_uziget(obj, cp)
     i_cp = StringValuePtr(cp);
 
 
-    uziget_(i_cp, &o_ipara, (ftnlen)strlen(i_cp));
+    uziget__(i_cp, &o_ipara, (ftnlen)strlen(i_cp));
 
     ipara = INT2NUM(o_ipara);
 
@@ -599,7 +602,7 @@ dcl_uziset(obj, cp, ipara)
     i_ipara = NUM2INT(ipara);
 
 
-    uziset_(i_cp, &i_ipara, (ftnlen)strlen(i_cp));
+    uziset__(i_cp, &i_ipara, (ftnlen)strlen(i_cp));
 
     return Qnil;
 
@@ -623,7 +626,7 @@ dcl_uzistx(obj, cp, ipara)
     i_ipara = NUM2INT(ipara);
 
 
-    uzistx_(i_cp, &i_ipara, (ftnlen)strlen(i_cp));
+    uzistx__(i_cp, &i_ipara, (ftnlen)strlen(i_cp));
 
     return Qnil;
 
@@ -636,7 +639,7 @@ dcl_uziqnp(obj)
     integer o_ncp;
     VALUE ncp;
 
-    uziqnp_(&o_ncp);
+    uziqnp__(&o_ncp);
 
     ncp = INT2NUM(o_ncp);
 
@@ -660,7 +663,7 @@ dcl_uziqid(obj, cp)
     i_cp = StringValuePtr(cp);
 
 
-    uziqid_(i_cp, &o_idx, (ftnlen)strlen(i_cp));
+    uziqid__(i_cp, &o_idx, (ftnlen)strlen(i_cp));
 
     idx = INT2NUM(o_idx);
 
@@ -686,7 +689,7 @@ dcl_uziqcp(obj, idx)
     o_cp= ALLOCA_N(char, (DFLT_SIZE+1));
     memset(o_cp, '\0', DFLT_SIZE+1);
 
-    uziqcp_(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
+    uziqcp__(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
 
     cp = rb_str_new2(o_cp);
 
@@ -712,7 +715,7 @@ dcl_uziqcl(obj, idx)
     o_cp= ALLOCA_N(char, (DFLT_SIZE+1));
     memset(o_cp, '\0', DFLT_SIZE+1);
 
-    uziqcl_(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
+    uziqcl__(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
 
     cp = rb_str_new2(o_cp);
 
@@ -736,7 +739,7 @@ dcl_uziqvl(obj, idx)
     i_idx = NUM2INT(idx);
 
 
-    uziqvl_(&i_idx, &o_ipara);
+    uziqvl__(&i_idx, &o_ipara);
 
     ipara = INT2NUM(o_ipara);
 
@@ -763,7 +766,7 @@ dcl_uzisvl(obj, idx, ipara)
     i_ipara = NUM2INT(ipara);
 
 
-    uzisvl_(&i_idx, &i_ipara);
+    uzisvl__(&i_idx, &i_ipara);
 
     return Qnil;
 
@@ -784,7 +787,7 @@ dcl_uziqin(obj, cp)
     i_cp = StringValuePtr(cp);
 
 
-    uziqin_(i_cp, &o_in, (ftnlen)strlen(i_cp));
+    uziqin__(i_cp, &o_in, (ftnlen)strlen(i_cp));
 
     in = INT2NUM(o_in);
 
@@ -806,7 +809,7 @@ dcl_uzisav(obj, iu)
     i_iu = NUM2INT(iu);
 
 
-    uzisav_(&i_iu);
+    uzisav__(&i_iu);
 
     return Qnil;
 
@@ -825,7 +828,7 @@ dcl_uzirst(obj, iu)
     i_iu = NUM2INT(iu);
 
 
-    uzirst_(&i_iu);
+    uzirst__(&i_iu);
 
     return Qnil;
 
@@ -846,7 +849,7 @@ dcl_uzlget(obj, cp)
     i_cp = StringValuePtr(cp);
 
 
-    uzlget_(i_cp, &o_lpara, (ftnlen)strlen(i_cp));
+    uzlget__(i_cp, &o_lpara, (ftnlen)strlen(i_cp));
 
     lpara = (o_lpara == FALSE_) ? Qfalse : Qtrue;
 
@@ -870,7 +873,7 @@ dcl_uzlset(obj, cp, lpara)
     i_lpara = ((lpara == Qnil)||(lpara == Qfalse)) ? FALSE_ : TRUE_;
 
 
-    uzlset_(i_cp, &i_lpara, (ftnlen)strlen(i_cp));
+    uzlset__(i_cp, &i_lpara, (ftnlen)strlen(i_cp));
 
     return Qnil;
 
@@ -891,7 +894,7 @@ dcl_uzlstx(obj, cp, lpara)
     i_lpara = ((lpara == Qnil)||(lpara == Qfalse)) ? FALSE_ : TRUE_;
 
 
-    uzlstx_(i_cp, &i_lpara, (ftnlen)strlen(i_cp));
+    uzlstx__(i_cp, &i_lpara, (ftnlen)strlen(i_cp));
 
     return Qnil;
 
@@ -904,7 +907,7 @@ dcl_uzlqnp(obj)
     integer o_ncp;
     VALUE ncp;
 
-    uzlqnp_(&o_ncp);
+    uzlqnp__(&o_ncp);
 
     ncp = INT2NUM(o_ncp);
 
@@ -928,7 +931,7 @@ dcl_uzlqid(obj, cp)
     i_cp = StringValuePtr(cp);
 
 
-    uzlqid_(i_cp, &o_idx, (ftnlen)strlen(i_cp));
+    uzlqid__(i_cp, &o_idx, (ftnlen)strlen(i_cp));
 
     idx = INT2NUM(o_idx);
 
@@ -954,7 +957,7 @@ dcl_uzlqcp(obj, idx)
     o_cp= ALLOCA_N(char, (DFLT_SIZE+1));
     memset(o_cp, '\0', DFLT_SIZE+1);
 
-    uzlqcp_(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
+    uzlqcp__(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
 
     cp = rb_str_new2(o_cp);
 
@@ -980,7 +983,7 @@ dcl_uzlqcl(obj, idx)
     o_cp= ALLOCA_N(char, (DFLT_SIZE+1));
     memset(o_cp, '\0', DFLT_SIZE+1);
 
-    uzlqcl_(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
+    uzlqcl__(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
 
     cp = rb_str_new2(o_cp);
 
@@ -1004,7 +1007,7 @@ dcl_uzlqvl(obj, idx)
     i_idx = NUM2INT(idx);
 
 
-    uzlqvl_(&i_idx, &o_lpara);
+    uzlqvl__(&i_idx, &o_lpara);
 
     lpara = (o_lpara == FALSE_) ? Qfalse : Qtrue;
 
@@ -1028,7 +1031,7 @@ dcl_uzlsvl(obj, idx, lpara)
     i_lpara = ((lpara == Qnil)||(lpara == Qfalse)) ? FALSE_ : TRUE_;
 
 
-    uzlsvl_(&i_idx, &i_lpara);
+    uzlsvl__(&i_idx, &i_lpara);
 
     return Qnil;
 
@@ -1049,7 +1052,7 @@ dcl_uzlqin(obj, cp)
     i_cp = StringValuePtr(cp);
 
 
-    uzlqin_(i_cp, &o_in, (ftnlen)strlen(i_cp));
+    uzlqin__(i_cp, &o_in, (ftnlen)strlen(i_cp));
 
     in = INT2NUM(o_in);
 
@@ -1071,7 +1074,7 @@ dcl_uzlsav(obj, iu)
     i_iu = NUM2INT(iu);
 
 
-    uzlsav_(&i_iu);
+    uzlsav__(&i_iu);
 
     return Qnil;
 
@@ -1090,7 +1093,7 @@ dcl_uzlrst(obj, iu)
     i_iu = NUM2INT(iu);
 
 
-    uzlrst_(&i_iu);
+    uzlrst__(&i_iu);
 
     return Qnil;
 
@@ -1111,7 +1114,7 @@ dcl_uzrget(obj, cp)
     i_cp = StringValuePtr(cp);
 
 
-    uzrget_(i_cp, &o_rpara, (ftnlen)strlen(i_cp));
+    uzrget__(i_cp, &o_rpara, (ftnlen)strlen(i_cp));
 
     rpara = rb_float_new((double)o_rpara);
 
@@ -1138,7 +1141,7 @@ dcl_uzrset(obj, cp, rpara)
     i_rpara = (real)NUM2DBL(rpara);
 
 
-    uzrset_(i_cp, &i_rpara, (ftnlen)strlen(i_cp));
+    uzrset__(i_cp, &i_rpara, (ftnlen)strlen(i_cp));
 
     return Qnil;
 
@@ -1162,7 +1165,7 @@ dcl_uzrstx(obj, cp, rpara)
     i_rpara = (real)NUM2DBL(rpara);
 
 
-    uzrstx_(i_cp, &i_rpara, (ftnlen)strlen(i_cp));
+    uzrstx__(i_cp, &i_rpara, (ftnlen)strlen(i_cp));
 
     return Qnil;
 
@@ -1175,7 +1178,7 @@ dcl_uzrqnp(obj)
     integer o_ncp;
     VALUE ncp;
 
-    uzrqnp_(&o_ncp);
+    uzrqnp__(&o_ncp);
 
     ncp = INT2NUM(o_ncp);
 
@@ -1199,7 +1202,7 @@ dcl_uzrqid(obj, cp)
     i_cp = StringValuePtr(cp);
 
 
-    uzrqid_(i_cp, &o_idx, (ftnlen)strlen(i_cp));
+    uzrqid__(i_cp, &o_idx, (ftnlen)strlen(i_cp));
 
     idx = INT2NUM(o_idx);
 
@@ -1225,7 +1228,7 @@ dcl_uzrqcp(obj, idx)
     o_cp= ALLOCA_N(char, (DFLT_SIZE+1));
     memset(o_cp, '\0', DFLT_SIZE+1);
 
-    uzrqcp_(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
+    uzrqcp__(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
 
     cp = rb_str_new2(o_cp);
 
@@ -1251,7 +1254,7 @@ dcl_uzrqcl(obj, idx)
     o_cp= ALLOCA_N(char, (DFLT_SIZE+1));
     memset(o_cp, '\0', DFLT_SIZE+1);
 
-    uzrqcl_(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
+    uzrqcl__(&i_idx, o_cp, (ftnlen)DFLT_SIZE);
 
     cp = rb_str_new2(o_cp);
 
@@ -1275,7 +1278,7 @@ dcl_uzrqvl(obj, idx)
     i_idx = NUM2INT(idx);
 
 
-    uzrqvl_(&i_idx, &o_rpara);
+    uzrqvl__(&i_idx, &o_rpara);
 
     rpara = rb_float_new((double)o_rpara);
 
@@ -1302,7 +1305,7 @@ dcl_uzrsvl(obj, idx, rpara)
     i_rpara = (real)NUM2DBL(rpara);
 
 
-    uzrsvl_(&i_idx, &i_rpara);
+    uzrsvl__(&i_idx, &i_rpara);
 
     return Qnil;
 
@@ -1323,7 +1326,7 @@ dcl_uzrqin(obj, cp)
     i_cp = StringValuePtr(cp);
 
 
-    uzrqin_(i_cp, &o_in, (ftnlen)strlen(i_cp));
+    uzrqin__(i_cp, &o_in, (ftnlen)strlen(i_cp));
 
     in = INT2NUM(o_in);
 
@@ -1345,7 +1348,7 @@ dcl_uzrsav(obj, iu)
     i_iu = NUM2INT(iu);
 
 
-    uzrsav_(&i_iu);
+    uzrsav__(&i_iu);
 
     return Qnil;
 
@@ -1364,7 +1367,7 @@ dcl_uzrrst(obj, iu)
     i_iu = NUM2INT(iu);
 
 
-    uzrrst_(&i_iu);
+    uzrrst__(&i_iu);
 
     return Qnil;
 
@@ -1374,7 +1377,7 @@ static VALUE
 dcl_uzpsav(obj)
     VALUE obj;
 {
-    uzpsav_();
+    uzpsav__();
 
     return Qnil;
 
@@ -1384,7 +1387,7 @@ static VALUE
 dcl_uzprst(obj)
     VALUE obj;
 {
-    uzprst_();
+    uzprst__();
 
     return Qnil;