Changeset: 4e81966a76ce for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4e81966a76ce
Modified Files:
monetdb5/extras/rapi/rapi.c
tools/embedded/embeddedr.c
Branch: embedded
Log Message:
fix for windows compilation regarding esoteric pragams. Thanks to Sjoerd!
diffs (27 lines):
diff --git a/monetdb5/extras/rapi/rapi.c b/monetdb5/extras/rapi/rapi.c
--- a/monetdb5/extras/rapi/rapi.c
+++ b/monetdb5/extras/rapi/rapi.c
@@ -40,6 +40,11 @@
//#define _RAPI_DEBUG_
+// this macro blows up mmath.h pragmas
+#ifdef warning
+# undef warning
+#endif
+
/* we need the BAT-SEXP-BAT conversion in two places, here and in
tools/embedded */
#include "converters.c.h"
diff --git a/tools/embedded/embeddedr.c b/tools/embedded/embeddedr.c
--- a/tools/embedded/embeddedr.c
+++ b/tools/embedded/embeddedr.c
@@ -72,7 +72,7 @@ SEXP monetdb_startup_R(SEXP dbdirsexp, S
}
#if defined(WIN32) && !defined(_WIN64)
- warning("MonetDBLite running in a 32-Bit Windows. This is not
recommended.");
+ Rf_warning("MonetDBLite running in a 32-Bit Windows. This is not
recommended.");
#endif
GetRNGstate();
res = monetdb_startup((char*) CHAR(STRING_ELT(dbdirsexp, 0)),
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
