[Distr-commits] r1151 - branches/distr-2.7/pkg/distrEx/src

[noreply at r-forge.r-project.org]

Author: ruckdeschel
Date: 2018-07-08 13:41:18 +0200 (Sun, 08 Jul 2018)
New Revision: 1151

Modified:
   branches/distr-2.7/pkg/distrEx/src/GLaw.c
Log:
[branches: distrEx]: began with major update to version 2.7 / registered native C-Code in distrEx 

Modified: branches/distr-2.7/pkg/distrEx/src/GLaw.c
===================================================================
--- branches/distr-2.7/pkg/distrEx/src/GLaw.c	2018-07-08 11:39:37 UTC (rev 1150)
+++ branches/distr-2.7/pkg/distrEx/src/GLaw.c	2018-07-08 11:41:18 UTC (rev 1151)
@@ -6,8 +6,6 @@
 #include <R_ext/Rdynload.h>
 #include <R_ext/Visibility.h>
 
-#define C_DEF(name, n)  {#name, (DL_FUNC) &name, n}
-
 void attribute_hidden gauleg(int *n, double *eps, double *A, double *W)
 { int i,j, m=((*n)+1)/2; double z1,z,pp,p1,p2,p3;
       for(i=1;i<=m;i++){
@@ -30,16 +28,23 @@
     }
 }
 
-/* P.R. 20170427: register routine */
+/* P.R. 20180708: revised register routine */
 
-static const R_CMethodDef R_CDef[]  = {
-    C_DEF(gauleg, 4),
-    {NULL, NULL, 0}
+static R_NativePrimitiveArgType gauleg_t[] = {
+    INTSXP, REALSXP, REALSXP, REALSXP
 };
 
+static const R_CMethodDef c_Methods[]  = {
+    {"gauleg", (DL_FUNC) &gauleg, 4, gauleg_t},
+    {NULL, NULL, 0, NULL}
+};
+
+
+/* P.R. 20170427: register routine */
+
 void attribute_visible R_init_distrEx(DllInfo *dll)
 {
-    R_registerRoutines(dll, R_CDef, NULL, NULL, NULL);
+    R_registerRoutines(dll, c_Methods, NULL, NULL, NULL);
     R_useDynamicSymbols(dll, FALSE);
     R_forceSymbols(dll, TRUE);