More tweaks for web assembly build

grimbough · Oct 20, 2023 · 6231085 · 6231085
1 parent 5695d6b
commit 6231085
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/configure b/configure
@@ -3620,7 +3620,7 @@ if test -z "$HAVE_ZSTD"; then
 printf "%s\n" "$as_me: compiling bundled Zstd library" >&6;}
   BUILD_ZSTD=libzstd.a
 
-  ZSTD_LIB=compression_tools/zstd/libzstd.a
+  ZSTD_LIB=./compression_tools/zstd/libzstd.a
 
 else
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using system Zstd library" >&5

diff --git a/src/compression_tools/blosc/lib/blosc-1.20.1/blosc-common.h b/src/compression_tools/blosc/lib/blosc-1.20.1/blosc-common.h
@@ -12,9 +12,13 @@
 
 #if !defined(NO_RLIB)
 #  include <R_ext/Print.h>
+#  include <R_ext/Error.h>
 #else
 #  ifndef Rprintf
-#    define Rprintf(x, ...) (printf(x, ...))
+#    define Rprintf(...) (printf(__VA_ARGS__))
+#  endif
+#  ifndef REprintf
+#    define REprintf(...) (fprintf(stderr, __VA_ARGS__))
 #  endif
 #endif
 

diff --git a/src/compression_tools/blosc/lib/snappy-1.1.1/snappy.cc b/src/compression_tools/blosc/lib/snappy-1.1.1/snappy.cc
@@ -41,10 +41,10 @@
 #  include <R_ext/Print.h>
 #else
 #  ifndef Rprintf
-#    define Rprintf(x, ...) (printf(x, ...))
+#    define Rprintf(...) (printf(__VA_ARGS__))
 #  endif
 #  ifndef error
-#    define error(x, ...) (fprintf(stderr, x, ...); abort())
+#    define error(...) ({fprintf(stderr, __VA_ARGS__); abort();})
 #  endif 
 #endif