Changeset: 1e6e30bf64d3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1e6e30bf64d3
Modified Files:
tools/embedded/embeddedr.c
tools/embedded/undef.h
Branch: embedded
Log Message:
Fix compilation on Linux
diffs (31 lines):
diff --git a/tools/embedded/embeddedr.c b/tools/embedded/embeddedr.c
--- a/tools/embedded/embeddedr.c
+++ b/tools/embedded/embeddedr.c
@@ -43,12 +43,11 @@ SEXP monetdb_query_R(SEXP connsexp, SEXP
if (notreally) {
BATsetcount(b, 0); // hehe
}
- SET_STRING_ELT(names, i, mkCharCE(output->cols[i].name,
CE_UTF8));
- varvalue = bat_to_sexp(b);
- if (!varvalue) {
+ if (!(varvalue = bat_to_sexp(b))) {
UNPROTECT(i + 3);
return ScalarString(mkCharCE("Conversion
error", CE_UTF8));
}
+ SET_STRING_ELT(names, i, mkCharCE(output->cols[i].name,
CE_UTF8));
SET_VECTOR_ELT(retlist, i, varvalue);
}
diff --git a/tools/embedded/undef.h b/tools/embedded/undef.h
--- a/tools/embedded/undef.h
+++ b/tools/embedded/undef.h
@@ -15,7 +15,8 @@ extern FILE* embedded_stderr;
#define exit(status) ((void) (status))
#undef assert
-#define assert(status) ((void) (status))
+#define NDEBUG 1
+#define assert(ignore) ((void) 0)
#undef stdout
#define stdout embedded_stdout
#undef stderr
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
