solve CRAN issues with clang13

david-cortes · Sep 1, 2021 · 5ad667a · 5ad667a
1 parent 2fb2a7b
commit 5ad667a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/configure.win b/configure.win
diff --git a/src/poismf.h b/src/poismf.h
@@ -65,6 +65,8 @@ extern "C" {
 #include <string.h>
 #include <stddef.h>
 #include <limits.h>
+#include <signal.h>
+typedef void (*sig_t_)(int);
 #ifdef _OPENMP
     #include <omp.h>
 #else
@@ -74,6 +76,7 @@ extern "C" {
     #define sparse_ix size_t
     #include <stdio.h>
 #else
+    #include <limits.h>
     #include <Rinternals.h>
     #include <R.h>
     #include <R_ext/Rdynload.h>
@@ -82,9 +85,8 @@ extern "C" {
     #define fprintf(f, ...) REprintf(__VA_ARGS__)
     #define sparse_ix int
     #undef USE_FLOAT
+    #include <Rinternals.h>
 #endif
-#include <signal.h>
-typedef void (*sig_t_)(int);
 
 #ifndef USE_FLOAT
     #ifndef real_t

diff --git a/src/rwrapper.c b/src/rwrapper.c
@@ -42,11 +42,6 @@
    if wrapping it for a different language. */
 #ifdef _FOR_R
 
-#include <R_ext/Rdynload.h>
-#include <R.h>
-#include <Rinternals.h>
-#include <limits.h>
-#include <math.h>
 #include "poismf.h"
 
 /* FORTRAN-BLAS -> CBLAS */