ruby-dcl 1.7.1 → 1.8.2

data/ext/numru/grph2_uvpack.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 *);
@@ -102,7 +105,7 @@ dcl_uverb(obj, n, upx, upy1, upy2)
     i_upy2 = dcl_obj2crealary(upy2);
 
 
-    uverb_(&i_n, i_upx, i_upy1, i_upy2);
+    uverb__(&i_n, i_upx, i_upy1, i_upy2);
 
     dcl_freecrealary(i_upx);
     dcl_freecrealary(i_upy1);
@@ -167,7 +170,7 @@ dcl_uverbz(obj, n, upx, upy1, upy2, itype, index, rsize)
     i_upy2 = dcl_obj2crealary(upy2);
 
 
-    uverbz_(&i_n, i_upx, i_upy1, i_upy2, &i_itype, &i_index, &i_rsize);
+    uverbz__(&i_n, i_upx, i_upy1, i_upy2, &i_itype, &i_index, &i_rsize);
 
     dcl_freecrealary(i_upx);
     dcl_freecrealary(i_upy1);
@@ -217,7 +220,7 @@ dcl_uvdif(obj, n, upx, upy1, upy2)
     i_upy2 = dcl_obj2crealary(upy2);
 
 
-    uvdif_(&i_n, i_upx, i_upy1, i_upy2);
+    uvdif__(&i_n, i_upx, i_upy1, i_upy2);
 
     dcl_freecrealary(i_upx);
     dcl_freecrealary(i_upy1);
@@ -277,7 +280,7 @@ dcl_uvdifz(obj, n, upx, upy1, upy2, itpat1, itpat2)
     i_upy2 = dcl_obj2crealary(upy2);
 
 
-    uvdifz_(&i_n, i_upx, i_upy1, i_upy2, &i_itpat1, &i_itpat2);
+    uvdifz__(&i_n, i_upx, i_upy1, i_upy2, &i_itpat1, &i_itpat2);
 
     dcl_freecrealary(i_upx);
     dcl_freecrealary(i_upy1);
@@ -327,7 +330,7 @@ dcl_uvbrf(obj, n, upx, upy1, upy2)
     i_upy2 = dcl_obj2crealary(upy2);
 
 
-    uvbrf_(&i_n, i_upx, i_upy1, i_upy2);
+    uvbrf__(&i_n, i_upx, i_upy1, i_upy2);
 
     dcl_freecrealary(i_upx);
     dcl_freecrealary(i_upy1);
@@ -392,7 +395,7 @@ dcl_uvbrfz(obj, n, upx, upy1, upy2, itype, index, rsize)
     i_upy2 = dcl_obj2crealary(upy2);
 
 
-    uvbrfz_(&i_n, i_upx, i_upy1, i_upy2, &i_itype, &i_index, &i_rsize);
+    uvbrfz__(&i_n, i_upx, i_upy1, i_upy2, &i_itype, &i_index, &i_rsize);
 
     dcl_freecrealary(i_upx);
     dcl_freecrealary(i_upy1);
@@ -442,7 +445,7 @@ dcl_uvbra(obj, n, upx, upy1, upy2)
     i_upy2 = dcl_obj2crealary(upy2);
 
 
-    uvbra_(&i_n, i_upx, i_upy1, i_upy2);
+    uvbra__(&i_n, i_upx, i_upy1, i_upy2);
 
     dcl_freecrealary(i_upx);
     dcl_freecrealary(i_upy1);
@@ -507,7 +510,7 @@ dcl_uvbraz(obj, n, upx, upy1, upy2, itpat1, itpat2, rsize)
     i_upy2 = dcl_obj2crealary(upy2);
 
 
-    uvbraz_(&i_n, i_upx, i_upy1, i_upy2, &i_itpat1, &i_itpat2, &i_rsize);
+    uvbraz__(&i_n, i_upx, i_upy1, i_upy2, &i_itpat1, &i_itpat2, &i_rsize);
 
     dcl_freecrealary(i_upx);
     dcl_freecrealary(i_upy1);
@@ -548,7 +551,7 @@ dcl_uvbrl(obj, n, upx, upy)
     i_upy = dcl_obj2crealary(upy);
 
 
-    uvbrl_(&i_n, i_upx, i_upy);
+    uvbrl__(&i_n, i_upx, i_upy);
 
     dcl_freecrealary(i_upx);
     dcl_freecrealary(i_upy);
@@ -603,7 +606,7 @@ dcl_uvbrlz(obj, n, upx, upy, itype, index, rsize)
     i_upy = dcl_obj2crealary(upy);
 
 
-    uvbrlz_(&i_n, i_upx, i_upy, &i_itype, &i_index, &i_rsize);
+    uvbrlz__(&i_n, i_upx, i_upy, &i_itype, &i_index, &i_rsize);
 
     dcl_freecrealary(i_upx);
     dcl_freecrealary(i_upy);
@@ -652,7 +655,7 @@ dcl_uvbxf(obj, n, upx, upy1, upy2)
     i_upy2 = dcl_obj2crealary(upy2);
 
 
-    uvbxf_(&i_n, i_upx, i_upy1, i_upy2);
+    uvbxf__(&i_n, i_upx, i_upy1, i_upy2);
 
     dcl_freecrealary(i_upx);
     dcl_freecrealary(i_upy1);
@@ -712,7 +715,7 @@ dcl_uvbxfz(obj, n, upx, upy1, upy2, itype, index)
     i_upy2 = dcl_obj2crealary(upy2);
 
 
-    uvbxfz_(&i_n, i_upx, i_upy1, i_upy2, &i_itype, &i_index);
+    uvbxfz__(&i_n, i_upx, i_upy1, i_upy2, &i_itype, &i_index);
 
     dcl_freecrealary(i_upx);
     dcl_freecrealary(i_upy1);
@@ -762,7 +765,7 @@ dcl_uvbxa(obj, n, upx, upy1, upy2)
     i_upy2 = dcl_obj2crealary(upy2);
 
 
-    uvbxa_(&i_n, i_upx, i_upy1, i_upy2);
+    uvbxa__(&i_n, i_upx, i_upy1, i_upy2);
 
     dcl_freecrealary(i_upx);
     dcl_freecrealary(i_upy1);
@@ -822,7 +825,7 @@ dcl_uvbxaz(obj, n, upx, upy1, upy2, itpat1, itpat2)
     i_upy2 = dcl_obj2crealary(upy2);
 
 
-    uvbxaz_(&i_n, i_upx, i_upy1, i_upy2, &i_itpat1, &i_itpat2);
+    uvbxaz__(&i_n, i_upx, i_upy1, i_upy2, &i_itpat1, &i_itpat2);
 
     dcl_freecrealary(i_upx);
     dcl_freecrealary(i_upy1);
@@ -863,7 +866,7 @@ dcl_uvbxl(obj, n, upx, upy)
     i_upy = dcl_obj2crealary(upy);
 
 
-    uvbxl_(&i_n, i_upx, i_upy);
+    uvbxl__(&i_n, i_upx, i_upy);
 
     dcl_freecrealary(i_upx);
     dcl_freecrealary(i_upy);
@@ -913,7 +916,7 @@ dcl_uvbxlz(obj, n, upx, upy, itype, index)
     i_upy = dcl_obj2crealary(upy);
 
 
-    uvbxlz_(&i_n, i_upx, i_upy, &i_itype, &i_index);
+    uvbxlz__(&i_n, i_upx, i_upy, &i_itype, &i_index);
 
     dcl_freecrealary(i_upx);
     dcl_freecrealary(i_upy);

data/ext/numru/grph2_uwpack.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 *);
@@ -84,7 +87,7 @@ dcl_uwsgxa(obj, xp, nx)
     i_xp = dcl_obj2crealary(xp);
 
 
-    uwsgxa_(i_xp, &i_nx);
+    uwsgxa__(i_xp, &i_nx);
 
     dcl_freecrealary(i_xp);
 
@@ -103,7 +106,7 @@ dcl_uwqgxa(obj)
 
     o_xp= ALLOCA_N(real, (o_nx));
 
-    uwqgxa_(o_xp, &o_nx);
+    uwqgxa__(o_xp, &o_nx);
 
     {int array_shape[1] = {o_nx};
      xp = dcl_crealary2obj(o_xp, (o_nx), 1, array_shape);
@@ -138,7 +141,7 @@ dcl_uwsgxb(obj, uxmin, uxmax, nx)
     i_nx = NUM2INT(nx);
 
 
-    uwsgxb_(&i_uxmin, &i_uxmax, &i_nx);
+    uwsgxb__(&i_uxmin, &i_uxmax, &i_nx);
 
     return Qnil;
 
@@ -155,7 +158,7 @@ dcl_uwqgxb(obj)
     VALUE uxmax;
     VALUE nx;
 
-    uwqgxb_(&o_uxmin, &o_uxmax, &o_nx);
+    uwqgxb__(&o_uxmin, &o_uxmax, &o_nx);
 
     uxmin = rb_float_new((double)o_uxmin);
     uxmax = rb_float_new((double)o_uxmax);
@@ -175,7 +178,7 @@ dcl_uwsgxz(obj, lsetx)
     i_lsetx = ((lsetx == Qnil)||(lsetx == Qfalse)) ? FALSE_ : TRUE_;
 
 
-    uwsgxz_(&i_lsetx);
+    uwsgxz__(&i_lsetx);
 
     return Qnil;
 
@@ -188,7 +191,7 @@ dcl_uwqgxz(obj)
     logical o_lsetx;
     VALUE lsetx;
 
-    uwqgxz_(&o_lsetx);
+    uwqgxz__(&o_lsetx);
 
     lsetx = (o_lsetx == FALSE_) ? Qfalse : Qtrue;
 
@@ -219,7 +222,7 @@ dcl_uwsgya(obj, yp, ny)
     i_yp = dcl_obj2crealary(yp);
 
 
-    uwsgya_(i_yp, &i_ny);
+    uwsgya__(i_yp, &i_ny);
 
     dcl_freecrealary(i_yp);
 
@@ -238,7 +241,7 @@ dcl_uwqgya(obj)
 
     o_yp= ALLOCA_N(real, (o_ny));
 
-    uwqgya_(o_yp, &o_ny);
+    uwqgya__(o_yp, &o_ny);
 
     {int array_shape[1] = {o_ny};
      yp = dcl_crealary2obj(o_yp, (o_ny), 1, array_shape);
@@ -273,7 +276,7 @@ dcl_uwsgyb(obj, uymin, uymax, ny)
     i_ny = NUM2INT(ny);
 
 
-    uwsgyb_(&i_uymin, &i_uymax, &i_ny);
+    uwsgyb__(&i_uymin, &i_uymax, &i_ny);
 
     return Qnil;
 
@@ -290,7 +293,7 @@ dcl_uwqgyb(obj)
     VALUE uymax;
     VALUE ny;
 
-    uwqgyb_(&o_uymin, &o_uymax, &o_ny);
+    uwqgyb__(&o_uymin, &o_uymax, &o_ny);
 
     uymin = rb_float_new((double)o_uymin);
     uymax = rb_float_new((double)o_uymax);
@@ -310,7 +313,7 @@ dcl_uwsgyz(obj, lsety)
     i_lsety = ((lsety == Qnil)||(lsety == Qfalse)) ? FALSE_ : TRUE_;
 
 
-    uwsgyz_(&i_lsety);
+    uwsgyz__(&i_lsety);
 
     return Qnil;
 
@@ -323,7 +326,7 @@ dcl_uwqgyz(obj)
     logical o_lsety;
     VALUE lsety;
 
-    uwqgyz_(&o_lsety);
+    uwqgyz__(&o_lsety);
 
     lsety = (o_lsety == FALSE_) ? Qfalse : Qtrue;
 
@@ -349,7 +352,7 @@ dcl_uwqgxi(obj, ux)
     i_ux = (real)NUM2DBL(ux);
 
 
-    uwqgxi_(&i_ux, &o_iux, &o_frac);
+    uwqgxi__(&i_ux, &o_iux, &o_frac);
 
     iux = INT2NUM(o_iux);
     frac = rb_float_new((double)o_frac);
@@ -363,7 +366,7 @@ static VALUE
 dcl_uwigxi(obj)
     VALUE obj;
 {
-    uwigxi_();
+    uwigxi__();
 
     return Qnil;
 
@@ -386,7 +389,7 @@ dcl_uwqgyi(obj, uy)
     i_uy = (real)NUM2DBL(uy);
 
 
-    uwqgyi_(&i_uy, &o_iuy, &o_frac);
+    uwqgyi__(&i_uy, &o_iuy, &o_frac);
 
     iuy = INT2NUM(o_iuy);
     frac = rb_float_new((double)o_frac);
@@ -400,7 +403,7 @@ static VALUE
 dcl_uwigyi(obj)
     VALUE obj;
 {
-    uwigyi_();
+    uwigyi__();
 
     return Qnil;
 
@@ -421,7 +424,7 @@ dcl_ruwgx(obj, ix)
     i_ix = NUM2INT(ix);
 
 
-    o_rtn_val = ruwgx_(&i_ix);
+    o_rtn_val = ruwgx__(&i_ix);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -445,7 +448,7 @@ dcl_ruwgy(obj, iy)
     i_iy = NUM2INT(iy);
 
 
-    o_rtn_val = ruwgy_(&i_iy);
+    o_rtn_val = ruwgy__(&i_iy);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -469,7 +472,7 @@ dcl_iuwgx(obj, ux)
     i_ux = (real)NUM2DBL(ux);
 
 
-    o_rtn_val = iuwgx_(&i_ux);
+    o_rtn_val = iuwgx__(&i_ux);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -493,7 +496,7 @@ dcl_iuwgy(obj, uy)
     i_uy = (real)NUM2DBL(uy);
 
 
-    o_rtn_val = iuwgy_(&i_uy);
+    o_rtn_val = iuwgy__(&i_uy);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -520,7 +523,7 @@ dcl_uwdflt(obj, nx, ny)
     i_ny = NUM2INT(ny);
 
 
-    uwdflt_(&i_nx, &i_ny);
+    uwdflt__(&i_nx, &i_ny);
 
     return Qnil;
 

data/ext/numru/grph2_uxpack.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_uxsaxz(obj, cside, roffx)
     i_roffx = (real)NUM2DBL(roffx);
 
 
-    uxsaxz_(i_cside, &i_roffx, (ftnlen)strlen(i_cside));
+    uxsaxz__(i_cside, &i_roffx, (ftnlen)strlen(i_cside));
 
     return Qnil;
 
@@ -99,7 +102,7 @@ dcl_uxsaxs(obj, cside)
     i_cside = StringValuePtr(cside);
 
 
-    uxsaxs_(i_cside, (ftnlen)strlen(i_cside));
+    uxsaxs__(i_cside, (ftnlen)strlen(i_cside));
 
     return Qnil;
 
@@ -123,7 +126,7 @@ dcl_uxpaxs(obj, cside, islct)
     i_islct = NUM2INT(islct);
 
 
-    uxpaxs_(i_cside, &i_islct, (ftnlen)strlen(i_cside));
+    uxpaxs__(i_cside, &i_islct, (ftnlen)strlen(i_cside));
 
     return Qnil;
 
@@ -161,7 +164,7 @@ dcl_uxptmk(obj, cside, islct, ux, n)
     i_ux = dcl_obj2crealary(ux);
 
 
-    uxptmk_(i_cside, &i_islct, i_ux, &i_n, (ftnlen)strlen(i_cside));
+    uxptmk__(i_cside, &i_islct, i_ux, &i_n, (ftnlen)strlen(i_cside));
 
     dcl_freecrealary(i_ux);
 
@@ -214,7 +217,7 @@ dcl_uxplbl(obj, cside, islct, ux, ch, nc, n)
     i_ch = dcl_obj2ccharary(ch, (i_n*DFLT_SIZE), DFLT_SIZE);
 
 
-    uxplbl_(i_cside, &i_islct, i_ux, i_ch, &i_nc, &i_n, (ftnlen)strlen(i_cside), (ftnlen)DFLT_SIZE);
+    uxplbl__(i_cside, &i_islct, i_ux, i_ch, &i_nc, &i_n, (ftnlen)strlen(i_cside), (ftnlen)DFLT_SIZE);
 
     dcl_freecrealary(i_ux);
     dcl_freeccharary(i_ch);
@@ -255,7 +258,7 @@ dcl_uxpnum(obj, cside, islct, ux, n)
     i_ux = dcl_obj2crealary(ux);
 
 
-    uxpnum_(i_cside, &i_islct, i_ux, &i_n, (ftnlen)strlen(i_cside));
+    uxpnum__(i_cside, &i_islct, i_ux, &i_n, (ftnlen)strlen(i_cside));
 
     dcl_freecrealary(i_ux);
 
@@ -291,7 +294,7 @@ dcl_uxpttl(obj, cside, islct, cttl, px)
     i_px = (real)NUM2DBL(px);
 
 
-    uxpttl_(i_cside, &i_islct, i_cttl, &i_px, (ftnlen)strlen(i_cside), (ftnlen)strlen(i_cttl));
+    uxpttl__(i_cside, &i_islct, i_cttl, &i_px, (ftnlen)strlen(i_cside), (ftnlen)strlen(i_cttl));
 
     return Qnil;
 
@@ -351,7 +354,7 @@ dcl_uxaxlb(obj, cside, ux1, n1, ux2, ch, nc, n2)
     i_ch = dcl_obj2ccharary(ch, (i_n2*DFLT_SIZE), DFLT_SIZE);
 
 
-    uxaxlb_(i_cside, i_ux1, &i_n1, i_ux2, i_ch, &i_nc, &i_n2, (ftnlen)strlen(i_cside), (ftnlen)DFLT_SIZE);
+    uxaxlb__(i_cside, i_ux1, &i_n1, i_ux2, i_ch, &i_nc, &i_n2, (ftnlen)strlen(i_cside), (ftnlen)DFLT_SIZE);
 
     dcl_freecrealary(i_ux1);
     dcl_freecrealary(i_ux2);
@@ -402,7 +405,7 @@ dcl_uxaxnm(obj, cside, ux1, n1, ux2, n2)
     i_ux2 = dcl_obj2crealary(ux2);
 
 
-    uxaxnm_(i_cside, i_ux1, &i_n1, i_ux2, &i_n2, (ftnlen)strlen(i_cside));
+    uxaxnm__(i_cside, i_ux1, &i_n1, i_ux2, &i_n2, (ftnlen)strlen(i_cside));
 
     dcl_freecrealary(i_ux1);
     dcl_freecrealary(i_ux2);
@@ -434,7 +437,7 @@ dcl_uxaxdv(obj, cside, dx1, dx2)
     i_dx2 = (real)NUM2DBL(dx2);
 
 
-    uxaxdv_(i_cside, &i_dx1, &i_dx2, (ftnlen)strlen(i_cside));
+    uxaxdv__(i_cside, &i_dx1, &i_dx2, (ftnlen)strlen(i_cside));
 
     return Qnil;
 
@@ -463,7 +466,7 @@ dcl_uxmttl(obj, cside, cttl, px)
     i_px = (real)NUM2DBL(px);
 
 
-    uxmttl_(i_cside, i_cttl, &i_px, (ftnlen)strlen(i_cside), (ftnlen)strlen(i_cttl));
+    uxmttl__(i_cside, i_cttl, &i_px, (ftnlen)strlen(i_cside), (ftnlen)strlen(i_cttl));
 
     return Qnil;
 
@@ -492,7 +495,7 @@ dcl_uxsttl(obj, cside, cttl, px)
     i_px = (real)NUM2DBL(px);
 
 
-    uxsttl_(i_cside, i_cttl, &i_px, (ftnlen)strlen(i_cside), (ftnlen)strlen(i_cttl));
+    uxsttl__(i_cside, i_cttl, &i_px, (ftnlen)strlen(i_cside), (ftnlen)strlen(i_cttl));
 
     return Qnil;
 
@@ -511,7 +514,7 @@ dcl_uxsfmt(obj, cfmt)
     i_cfmt = StringValuePtr(cfmt);
 
 
-    uxsfmt_(i_cfmt, (ftnlen)strlen(i_cfmt));
+    uxsfmt__(i_cfmt, (ftnlen)strlen(i_cfmt));
 
     return Qnil;
 
@@ -527,7 +530,7 @@ dcl_uxqfmt(obj)
     o_cfmt= ALLOCA_N(char, (DFLT_SIZE+1));
     memset(o_cfmt, '\0', DFLT_SIZE+1);
 
-    uxqfmt_(o_cfmt, (ftnlen)DFLT_SIZE);
+    uxqfmt__(o_cfmt, (ftnlen)DFLT_SIZE);
 
     cfmt = rb_str_new2(o_cfmt);