Changeset: 309cd215cf09 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=309cd215cf09
Modified Files:
monetdb5/extras/pyapi/pyapi.c
monetdb5/extras/pyapi/pyapi.h
Branch: pyapi
Log Message:
Minor compilation fixes.
diffs (32 lines):
diff --git a/monetdb5/extras/pyapi/pyapi.c b/monetdb5/extras/pyapi/pyapi.c
--- a/monetdb5/extras/pyapi/pyapi.c
+++ b/monetdb5/extras/pyapi/pyapi.c
@@ -121,7 +121,6 @@ static bool python_call_active = false;
#else
#define BAT_TO_NP(bat, mtpe, nptpe)
\
if (copy) {
\
- mtpe *array;
\
vararray = PyArray_EMPTY(1, (npy_intp[1]) {(t_end - t_start)},
nptpe, 0); \
memcpy(PyArray_DATA((PyArrayObject*)vararray), Tloc(bat,
BUNfirst(bat)), sizeof(mtpe) * (t_end - t_start)); \
} else {
\
@@ -546,7 +545,9 @@ str PyAPIeval(Client cntxt, MalBlkPtr mb
MT_lock_unset(&pyapiLock, "pyapi.evaluate");
}
+#ifdef _PYAPI_TESTING_
if (!option_enablefork) mapped = false;
+#endif
/*[FORK_PROCESS]*/
if (mapped)
diff --git a/monetdb5/extras/pyapi/pyapi.h b/monetdb5/extras/pyapi/pyapi.h
--- a/monetdb5/extras/pyapi/pyapi.h
+++ b/monetdb5/extras/pyapi/pyapi.h
@@ -26,7 +26,6 @@
#define _PYAPI_WARNINGS_
// Enable debug mode, does literally nothing right now, but hey we have this
nice #define here anyway
#define _PYAPI_DEBUG_
-#define _PYAPI_TESTING_
#endif
#ifdef _PYAPI_VERBOSE_
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
