ruby-dcl 1.7.1 → 1.8.2

data/ext/numru/math1_ifalib.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_imax(obj, ix, n, jx)
     i_ix = dcl_obj2cintegerary(ix);
 
 
-    o_rtn_val = imax_(i_ix, &i_n, &i_jx);
+    o_rtn_val = imax__(i_ix, &i_n, &i_jx);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -130,7 +133,7 @@ dcl_imax0(obj, ix, n, jx)
     i_ix = dcl_obj2cintegerary(ix);
 
 
-    o_rtn_val = imax0_(i_ix, &i_n, &i_jx);
+    o_rtn_val = imax0__(i_ix, &i_n, &i_jx);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -169,7 +172,7 @@ dcl_imax1(obj, ix, n, jx)
     i_ix = dcl_obj2cintegerary(ix);
 
 
-    o_rtn_val = imax1_(i_ix, &i_n, &i_jx);
+    o_rtn_val = imax1__(i_ix, &i_n, &i_jx);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -208,7 +211,7 @@ dcl_imin(obj, ix, n, jx)
     i_ix = dcl_obj2cintegerary(ix);
 
 
-    o_rtn_val = imin_(i_ix, &i_n, &i_jx);
+    o_rtn_val = imin__(i_ix, &i_n, &i_jx);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -247,7 +250,7 @@ dcl_imin0(obj, ix, n, jx)
     i_ix = dcl_obj2cintegerary(ix);
 
 
-    o_rtn_val = imin0_(i_ix, &i_n, &i_jx);
+    o_rtn_val = imin0__(i_ix, &i_n, &i_jx);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -286,7 +289,7 @@ dcl_imin1(obj, ix, n, jx)
     i_ix = dcl_obj2cintegerary(ix);
 
 
-    o_rtn_val = imin1_(i_ix, &i_n, &i_jx);
+    o_rtn_val = imin1__(i_ix, &i_n, &i_jx);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -325,7 +328,7 @@ dcl_isum(obj, ix, n, jx)
     i_ix = dcl_obj2cintegerary(ix);
 
 
-    o_rtn_val = isum_(i_ix, &i_n, &i_jx);
+    o_rtn_val = isum__(i_ix, &i_n, &i_jx);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -364,7 +367,7 @@ dcl_isum0(obj, ix, n, jx)
     i_ix = dcl_obj2cintegerary(ix);
 
 
-    o_rtn_val = isum0_(i_ix, &i_n, &i_jx);
+    o_rtn_val = isum0__(i_ix, &i_n, &i_jx);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -403,7 +406,7 @@ dcl_isum1(obj, ix, n, jx)
     i_ix = dcl_obj2cintegerary(ix);
 
 
-    o_rtn_val = isum1_(i_ix, &i_n, &i_jx);
+    o_rtn_val = isum1__(i_ix, &i_n, &i_jx);
 
     rtn_val = INT2NUM(o_rtn_val);
 

data/ext/numru/math1_indxlib.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 *);
@@ -95,7 +98,7 @@ dcl_indxcf(obj, cx, n, jd, ch)
     i_cx = dcl_obj2ccharary(cx, (i_jd*(i_n-1)+1), 1);
 
 
-    o_rtn_val = indxcf_(i_cx, &i_n, &i_jd, i_ch, (ftnlen)1, (ftnlen)strlen(i_ch));
+    o_rtn_val = indxcf__(i_cx, &i_n, &i_jd, i_ch, (ftnlen)1, (ftnlen)strlen(i_ch));
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -138,7 +141,7 @@ dcl_indxcl(obj, cx, n, jd, ch)
     i_cx = dcl_obj2ccharary(cx, (i_jd*(i_n-1)+1), 1);
 
 
-    o_rtn_val = indxcl_(i_cx, &i_n, &i_jd, i_ch, (ftnlen)1, (ftnlen)strlen(i_ch));
+    o_rtn_val = indxcl__(i_cx, &i_n, &i_jd, i_ch, (ftnlen)1, (ftnlen)strlen(i_ch));
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -178,7 +181,7 @@ dcl_indxmf(obj, cx, n, jd, ch)
     i_ch = StringValuePtr(ch);
 
 
-    o_rtn_val = indxmf_(i_cx, &i_n, &i_jd, i_ch, (ftnlen)strlen(i_cx), (ftnlen)strlen(i_ch));
+    o_rtn_val = indxmf__(i_cx, &i_n, &i_jd, i_ch, (ftnlen)strlen(i_cx), (ftnlen)strlen(i_ch));
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -217,7 +220,7 @@ dcl_indxml(obj, cx, n, jd, ch)
     i_ch = StringValuePtr(ch);
 
 
-    o_rtn_val = indxml_(i_cx, &i_n, &i_jd, i_ch, (ftnlen)strlen(i_cx), (ftnlen)strlen(i_ch));
+    o_rtn_val = indxml__(i_cx, &i_n, &i_jd, i_ch, (ftnlen)strlen(i_cx), (ftnlen)strlen(i_ch));
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -256,7 +259,7 @@ dcl_indxnf(obj, cx, n, jd, ch)
     i_ch = StringValuePtr(ch);
 
 
-    o_rtn_val = indxnf_(i_cx, &i_n, &i_jd, i_ch, (ftnlen)strlen(i_cx), (ftnlen)strlen(i_ch));
+    o_rtn_val = indxnf__(i_cx, &i_n, &i_jd, i_ch, (ftnlen)strlen(i_cx), (ftnlen)strlen(i_ch));
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -295,7 +298,7 @@ dcl_indxnl(obj, cx, n, jd, ch)
     i_ch = StringValuePtr(ch);
 
 
-    o_rtn_val = indxnl_(i_cx, &i_n, &i_jd, i_ch, (ftnlen)strlen(i_cx), (ftnlen)strlen(i_ch));
+    o_rtn_val = indxnl__(i_cx, &i_n, &i_jd, i_ch, (ftnlen)strlen(i_cx), (ftnlen)strlen(i_ch));
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -338,7 +341,7 @@ dcl_indxif(obj, ix, n, jd, ii)
     i_ix = dcl_obj2cintegerary(ix);
 
 
-    o_rtn_val = indxif_(i_ix, &i_n, &i_jd, &i_ii);
+    o_rtn_val = indxif__(i_ix, &i_n, &i_jd, &i_ii);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -382,7 +385,7 @@ dcl_indxil(obj, ix, n, jd, ii)
     i_ix = dcl_obj2cintegerary(ix);
 
 
-    o_rtn_val = indxil_(i_ix, &i_n, &i_jd, &i_ii);
+    o_rtn_val = indxil__(i_ix, &i_n, &i_jd, &i_ii);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -426,7 +429,7 @@ dcl_indxrf(obj, rx, n, jd, rr)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = indxrf_(i_rx, &i_n, &i_jd, &i_rr);
+    o_rtn_val = indxrf__(i_rx, &i_n, &i_jd, &i_rr);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -470,7 +473,7 @@ dcl_indxrl(obj, rx, n, jd, rr)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = indxrl_(i_rx, &i_n, &i_jd, &i_rr);
+    o_rtn_val = indxrl__(i_rx, &i_n, &i_jd, &i_rr);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -513,7 +516,7 @@ dcl_nindxc(obj, cx, n, jd, ch)
     i_cx = dcl_obj2ccharary(cx, (i_jd*(i_n-1)+1), 1);
 
 
-    o_rtn_val = nindxc_(i_cx, &i_n, &i_jd, i_ch, (ftnlen)1, (ftnlen)strlen(i_ch));
+    o_rtn_val = nindxc__(i_cx, &i_n, &i_jd, i_ch, (ftnlen)1, (ftnlen)strlen(i_ch));
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -553,7 +556,7 @@ dcl_nindxm(obj, cx, n, jd, ch)
     i_ch = StringValuePtr(ch);
 
 
-    o_rtn_val = nindxm_(i_cx, &i_n, &i_jd, i_ch, (ftnlen)strlen(i_cx), (ftnlen)strlen(i_ch));
+    o_rtn_val = nindxm__(i_cx, &i_n, &i_jd, i_ch, (ftnlen)strlen(i_cx), (ftnlen)strlen(i_ch));
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -592,7 +595,7 @@ dcl_nindxn(obj, cx, n, jd, ch)
     i_ch = StringValuePtr(ch);
 
 
-    o_rtn_val = nindxn_(i_cx, &i_n, &i_jd, i_ch, (ftnlen)strlen(i_cx), (ftnlen)strlen(i_ch));
+    o_rtn_val = nindxn__(i_cx, &i_n, &i_jd, i_ch, (ftnlen)strlen(i_cx), (ftnlen)strlen(i_ch));
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -635,7 +638,7 @@ dcl_nindxi(obj, ix, n, jd, ii)
     i_ix = dcl_obj2cintegerary(ix);
 
 
-    o_rtn_val = nindxi_(i_ix, &i_n, &i_jd, &i_ii);
+    o_rtn_val = nindxi__(i_ix, &i_n, &i_jd, &i_ii);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -679,7 +682,7 @@ dcl_nindxr(obj, rx, n, jd, rr)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = nindxr_(i_rx, &i_n, &i_jd, &i_rr);
+    o_rtn_val = nindxr__(i_rx, &i_n, &i_jd, &i_rr);
 
     rtn_val = INT2NUM(o_rtn_val);
 

data/ext/numru/math1_intlib.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_irlt(obj, rx)
     i_rx = (real)NUM2DBL(rx);
 
 
-    o_rtn_val = irlt_(&i_rx);
+    o_rtn_val = irlt__(&i_rx);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -101,7 +104,7 @@ dcl_irge(obj, rx)
     i_rx = (real)NUM2DBL(rx);
 
 
-    o_rtn_val = irge_(&i_rx);
+    o_rtn_val = irge__(&i_rx);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -125,7 +128,7 @@ dcl_irle(obj, rx)
     i_rx = (real)NUM2DBL(rx);
 
 
-    o_rtn_val = irle_(&i_rx);
+    o_rtn_val = irle__(&i_rx);
 
     rtn_val = INT2NUM(o_rtn_val);
 
@@ -149,7 +152,7 @@ dcl_irgt(obj, rx)
     i_rx = (real)NUM2DBL(rx);
 
 
-    o_rtn_val = irgt_(&i_rx);
+    o_rtn_val = irgt__(&i_rx);
 
     rtn_val = INT2NUM(o_rtn_val);
 

data/ext/numru/math1_lrllib.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 *);
@@ -82,7 +85,7 @@ dcl_lreq(obj, x, y)
     i_y = (real)NUM2DBL(y);
 
 
-    o_rtn_val = lreq_(&i_x, &i_y);
+    o_rtn_val = lreq__(&i_x, &i_y);
 
     rtn_val = (o_rtn_val == FALSE_) ? Qfalse : Qtrue;
 
@@ -111,7 +114,7 @@ dcl_lreq0(obj, x, y)
     i_y = (real)NUM2DBL(y);
 
 
-    o_rtn_val = lreq0_(&i_x, &i_y);
+    o_rtn_val = lreq0__(&i_x, &i_y);
 
     rtn_val = (o_rtn_val == FALSE_) ? Qfalse : Qtrue;
 
@@ -140,7 +143,7 @@ dcl_lreq1(obj, x, y)
     i_y = (real)NUM2DBL(y);
 
 
-    o_rtn_val = lreq1_(&i_x, &i_y);
+    o_rtn_val = lreq1__(&i_x, &i_y);
 
     rtn_val = (o_rtn_val == FALSE_) ? Qfalse : Qtrue;
 
@@ -174,7 +177,7 @@ dcl_lreqa(obj, x, y, epsl)
     i_epsl = (real)NUM2DBL(epsl);
 
 
-    o_rtn_val = lreqa_(&i_x, &i_y, &i_epsl);
+    o_rtn_val = lreqa__(&i_x, &i_y, &i_epsl);
 
     rtn_val = (o_rtn_val == FALSE_) ? Qfalse : Qtrue;
 
@@ -203,7 +206,7 @@ dcl_lrne(obj, x, y)
     i_y = (real)NUM2DBL(y);
 
 
-    o_rtn_val = lrne_(&i_x, &i_y);
+    o_rtn_val = lrne__(&i_x, &i_y);
 
     rtn_val = (o_rtn_val == FALSE_) ? Qfalse : Qtrue;
 
@@ -232,7 +235,7 @@ dcl_lrne0(obj, x, y)
     i_y = (real)NUM2DBL(y);
 
 
-    o_rtn_val = lrne0_(&i_x, &i_y);
+    o_rtn_val = lrne0__(&i_x, &i_y);
 
     rtn_val = (o_rtn_val == FALSE_) ? Qfalse : Qtrue;
 
@@ -261,7 +264,7 @@ dcl_lrne1(obj, x, y)
     i_y = (real)NUM2DBL(y);
 
 
-    o_rtn_val = lrne1_(&i_x, &i_y);
+    o_rtn_val = lrne1__(&i_x, &i_y);
 
     rtn_val = (o_rtn_val == FALSE_) ? Qfalse : Qtrue;
 
@@ -295,7 +298,7 @@ dcl_lrnea(obj, x, y, epsl)
     i_epsl = (real)NUM2DBL(epsl);
 
 
-    o_rtn_val = lrnea_(&i_x, &i_y, &i_epsl);
+    o_rtn_val = lrnea__(&i_x, &i_y, &i_epsl);
 
     rtn_val = (o_rtn_val == FALSE_) ? Qfalse : Qtrue;
 
@@ -324,7 +327,7 @@ dcl_lrlt(obj, x, y)
     i_y = (real)NUM2DBL(y);
 
 
-    o_rtn_val = lrlt_(&i_x, &i_y);
+    o_rtn_val = lrlt__(&i_x, &i_y);
 
     rtn_val = (o_rtn_val == FALSE_) ? Qfalse : Qtrue;
 
@@ -353,7 +356,7 @@ dcl_lrlt0(obj, x, y)
     i_y = (real)NUM2DBL(y);
 
 
-    o_rtn_val = lrlt0_(&i_x, &i_y);
+    o_rtn_val = lrlt0__(&i_x, &i_y);
 
     rtn_val = (o_rtn_val == FALSE_) ? Qfalse : Qtrue;
 
@@ -382,7 +385,7 @@ dcl_lrlt1(obj, x, y)
     i_y = (real)NUM2DBL(y);
 
 
-    o_rtn_val = lrlt1_(&i_x, &i_y);
+    o_rtn_val = lrlt1__(&i_x, &i_y);
 
     rtn_val = (o_rtn_val == FALSE_) ? Qfalse : Qtrue;
 
@@ -416,7 +419,7 @@ dcl_lrlta(obj, x, y, epsl)
     i_epsl = (real)NUM2DBL(epsl);
 
 
-    o_rtn_val = lrlta_(&i_x, &i_y, &i_epsl);
+    o_rtn_val = lrlta__(&i_x, &i_y, &i_epsl);
 
     rtn_val = (o_rtn_val == FALSE_) ? Qfalse : Qtrue;
 
@@ -445,7 +448,7 @@ dcl_lrgt(obj, x, y)
     i_y = (real)NUM2DBL(y);
 
 
-    o_rtn_val = lrgt_(&i_x, &i_y);
+    o_rtn_val = lrgt__(&i_x, &i_y);
 
     rtn_val = (o_rtn_val == FALSE_) ? Qfalse : Qtrue;
 
@@ -474,7 +477,7 @@ dcl_lrgt0(obj, x, y)
     i_y = (real)NUM2DBL(y);
 
 
-    o_rtn_val = lrgt0_(&i_x, &i_y);
+    o_rtn_val = lrgt0__(&i_x, &i_y);
 
     rtn_val = (o_rtn_val == FALSE_) ? Qfalse : Qtrue;
 
@@ -503,7 +506,7 @@ dcl_lrgt1(obj, x, y)
     i_y = (real)NUM2DBL(y);
 
 
-    o_rtn_val = lrgt1_(&i_x, &i_y);
+    o_rtn_val = lrgt1__(&i_x, &i_y);
 
     rtn_val = (o_rtn_val == FALSE_) ? Qfalse : Qtrue;
 
@@ -537,7 +540,7 @@ dcl_lrgta(obj, x, y, epsl)
     i_epsl = (real)NUM2DBL(epsl);
 
 
-    o_rtn_val = lrgta_(&i_x, &i_y, &i_epsl);
+    o_rtn_val = lrgta__(&i_x, &i_y, &i_epsl);
 
     rtn_val = (o_rtn_val == FALSE_) ? Qfalse : Qtrue;
 
@@ -566,7 +569,7 @@ dcl_lrle(obj, x, y)
     i_y = (real)NUM2DBL(y);
 
 
-    o_rtn_val = lrle_(&i_x, &i_y);
+    o_rtn_val = lrle__(&i_x, &i_y);
 
     rtn_val = (o_rtn_val == FALSE_) ? Qfalse : Qtrue;
 
@@ -595,7 +598,7 @@ dcl_lrle0(obj, x, y)
     i_y = (real)NUM2DBL(y);
 
 
-    o_rtn_val = lrle0_(&i_x, &i_y);
+    o_rtn_val = lrle0__(&i_x, &i_y);
 
     rtn_val = (o_rtn_val == FALSE_) ? Qfalse : Qtrue;
 
@@ -624,7 +627,7 @@ dcl_lrle1(obj, x, y)
     i_y = (real)NUM2DBL(y);
 
 
-    o_rtn_val = lrle1_(&i_x, &i_y);
+    o_rtn_val = lrle1__(&i_x, &i_y);
 
     rtn_val = (o_rtn_val == FALSE_) ? Qfalse : Qtrue;
 
@@ -658,7 +661,7 @@ dcl_lrlea(obj, x, y, epsl)
     i_epsl = (real)NUM2DBL(epsl);
 
 
-    o_rtn_val = lrlea_(&i_x, &i_y, &i_epsl);
+    o_rtn_val = lrlea__(&i_x, &i_y, &i_epsl);
 
     rtn_val = (o_rtn_val == FALSE_) ? Qfalse : Qtrue;
 
@@ -687,7 +690,7 @@ dcl_lrge(obj, x, y)
     i_y = (real)NUM2DBL(y);
 
 
-    o_rtn_val = lrge_(&i_x, &i_y);
+    o_rtn_val = lrge__(&i_x, &i_y);
 
     rtn_val = (o_rtn_val == FALSE_) ? Qfalse : Qtrue;
 
@@ -716,7 +719,7 @@ dcl_lrge0(obj, x, y)
     i_y = (real)NUM2DBL(y);
 
 
-    o_rtn_val = lrge0_(&i_x, &i_y);
+    o_rtn_val = lrge0__(&i_x, &i_y);
 
     rtn_val = (o_rtn_val == FALSE_) ? Qfalse : Qtrue;
 
@@ -745,7 +748,7 @@ dcl_lrge1(obj, x, y)
     i_y = (real)NUM2DBL(y);
 
 
-    o_rtn_val = lrge1_(&i_x, &i_y);
+    o_rtn_val = lrge1__(&i_x, &i_y);
 
     rtn_val = (o_rtn_val == FALSE_) ? Qfalse : Qtrue;
 
@@ -779,7 +782,7 @@ dcl_lrgea(obj, x, y, epsl)
     i_epsl = (real)NUM2DBL(epsl);
 
 
-    o_rtn_val = lrgea_(&i_x, &i_y, &i_epsl);
+    o_rtn_val = lrgea__(&i_x, &i_y, &i_epsl);
 
     rtn_val = (o_rtn_val == FALSE_) ? Qfalse : Qtrue;
 

data/ext/numru/math1_maplib.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 *);
@@ -75,7 +78,7 @@ dcl_mpscon(obj, ylat0)
     i_ylat0 = (real)NUM2DBL(ylat0);
 
 
-    mpscon_(&i_ylat0);
+    mpscon__(&i_ylat0);
 
     return Qnil;
 
@@ -94,7 +97,7 @@ dcl_mpscoa(obj, ylat1)
     i_ylat1 = (real)NUM2DBL(ylat1);
 
 
-    mpscoa_(&i_ylat1);
+    mpscoa__(&i_ylat1);
 
     return Qnil;
 
@@ -118,7 +121,7 @@ dcl_mpscoc(obj, ylat1, ylat2)
     i_ylat2 = (real)NUM2DBL(ylat2);
 
 
-    mpscoc_(&i_ylat1, &i_ylat2);
+    mpscoc__(&i_ylat1, &i_ylat2);
 
     return Qnil;
 
@@ -137,7 +140,7 @@ dcl_mpsbon(obj, ylat1)
     i_ylat1 = (real)NUM2DBL(ylat1);
 
 
-    mpsbon_(&i_ylat1);
+    mpsbon__(&i_ylat1);
 
     return Qnil;
 
@@ -156,7 +159,7 @@ dcl_mpsotg(obj, rsat)
     i_rsat = (real)NUM2DBL(rsat);
 
 
-    mpsotg_(&i_rsat);
+    mpsotg__(&i_rsat);
 
     return Qnil;