patch source code for compile errors (Jagan/Bolker)

src/chebpol.c

@@ -116,7 +116,7 @@ static void chebcoef(double *x, int *dims, const int rank, double *F, int dct, i
       src = dest;
       dest = p;
 
-      F77_CALL(dgemm)("TRANS","TRANS",&N,&stride,&N,&alpha,mat[i],&N,src,&stride,&beta,dest,&N);
+      F77_CALL(dgemm)("T", "T", &N, &stride, &N, &alpha, mat[i], &N, src, &stride, &beta, dest, &N FCONE FCONE);
       // Fix the first element in each vector, nah do it at the end
       //    for(int k = 0; k < siz; k+= N) dest[k] *= 0.5;
     }
@@ -193,7 +193,7 @@ static double FH(double *fv, double *x, double **knots, int *dims, const int ran
 
   // Special case:
   for(int i = 0; i < N; i++) {
-    if(fabs(xx - kn[i]) < 10.0*DOUBLE_EPS) return FH(&fv[i*siz], x, knots, dims, newrank, weights);
+    if(fabs(xx - kn[i]) < 10.0*DBL_EPSILON) return FH(&fv[i*siz], x, knots, dims, newrank, weights);
   }
 
 #if 1
@@ -755,7 +755,7 @@ static double findsimplex(double *x, double *knots, int *dtri, double *lumats, i
     int *ipiv = ipivs + simplex*N;
     for(int d = 0; d < dim; d++) vec[d] = x[d];
     vec[dim] = 1.0;
-    F77_CALL(dgetrs)("N", &N, &one, lumat, &N, ipiv, vec, &N, &info);
+    F77_CALL(dgetrs)("N", &N, &one, lumat, &N, ipiv, vec, &N, &info FCONE);
     for(int d = 0; d < N; d++) if(vec[d] < -1e-10) {bad = 1; break;}
     if(bad) continue;
 
@@ -794,7 +794,7 @@ static double findsimplex(double *x, double *knots, int *dtri, double *lumats, i
     const int *tri = dtri + nearest * (dim+1);
     for(int d = 0; d < dim; d++) vec[d] = x[d];
     vec[dim] = 1.0;
-    F77_CALL(dgetrs)("N", &N, &one, lumat, &N, ipiv, vec, &N, &info);
+    F77_CALL(dgetrs)("N", &N, &one, lumat, &N, ipiv, vec, &N, &info FCONE);
     double sum = 0;
     for(int d = 0; d <= dim; d++) sum += vec[d]*val[tri[d]-1];
     return sum;

src/chebpol.h

@@ -1,14 +1,26 @@
 #ifndef _CHEBPOL
 #define _CHEBPOL
+
+#include <float.h>
 #include <math.h>
-#include <Rmath.h>
-#include <R.h>
-#include <Rdefines.h>
-#include <R_ext/Rdynload.h>
+
+#ifndef  USE_FC_LEN_T
+# define USE_FC_LEN_T
+#endif
+#include <Rconfig.h>
 #include <R_ext/BLAS.h>
 #include <R_ext/Lapack.h>
+#ifndef FCONE
+# define FCONE
+#endif
+
+#include <R.h>
+#include <Rdefines.h>
+#include <Rmath.h>
 #include <R_ext/Applic.h>
+#include <R_ext/Rdynload.h>
 #include <R_ext/Visibility.h>
+
 #include "config.h"
 
 SEXP R_makerbf(SEXP, SEXP, SEXP, SEXP);

src/stalker.c

@@ -5,7 +5,7 @@
 #include <gsl/gsl_roots.h>
 #endif
 
-#define MYEPS (1e3*sqrt(DOUBLE_EPS))
+#define MYEPS (1e3*sqrt(DBL_EPSILON))
 typedef struct {double dmin, dplus, vmin, vplus; int pos;} rblock;
 typedef struct {double kq, vmin, vplus;} sblock;
 typedef struct {double *det, *pmin, *pplus;int uniform;} precomp;
@@ -135,15 +135,15 @@ static R_INLINE double stalkhyp(double x, double vmin, double vplus,double dmin,
   //  double iD = 1.0/(dmin*pow(dplus,r) + pow(dmin,r)*dplus);
   //  double b = (vplus*pow(dmin,r) - vmin*pow(dplus,r))*iD;
   //  double c = (vplus*dmin + vmin*dplus)*iD;
-  if(fabs(x - dplus) < 1e3*DOUBLE_EPS*dplus) return vplus;
-  if(fabs(x + dmin) < 1e3*DOUBLE_EPS*dmin) return vmin;
+  if(fabs(x - dplus) < 1e3*DBL_EPSILON*dplus) return vplus;
+  if(fabs(x + dmin) < 1e3*DBL_EPSILON*dmin) return vmin;
   // hyperbolic function
   // a+bx-a/(cx+1)
-  if(fabs(vplus*dmin + vmin*dplus) < 1e3*DOUBLE_EPS*dmin*dplus) return x*(vplus-vmin)/(dplus+dmin); //linear
+  if(fabs(vplus*dmin + vmin*dplus) < 1e3*DBL_EPSILON*dmin*dplus) return x*(vplus-vmin)/(dplus+dmin); //linear
   if(sign(vplus*vmin) < 0) {
     //monotonic, set b=0
     double a,c;
-    if(fabs(vmin-vplus) < 1e3*DOUBLE_EPS) return 0;
+    if(fabs(vmin-vplus) < 1e3*DBL_EPSILON) return 0;
 #if 1
     c = (vmin*dplus + vplus*dmin)/(dmin*dplus*(vmin-vplus));
     a = vplus + vplus/(c*dplus);
@@ -170,7 +170,7 @@ static R_INLINE double stalkhyp(double x, double vmin, double vplus,double dmin,
     // non-monotonic
     double D = dplus*dplus*vmin - dmin*dmin*vplus;
 
-    if(fabs(D) < 1e3*DOUBLE_EPS) {
+    if(fabs(D) < 1e3*DBL_EPSILON) {
       double a;
       // if c==0, it's a parabola y = a*x^2
       // we have (0,0), (-dmin,vmin), and (dplus,vplus)