Changeset: 5536eb2ae761 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5536eb2ae761
Modified Files:
sql/backends/monet5/UDF/pyapi/conversion.c
sql/backends/monet5/UDF/pyapi/convert_loops.h
Branch: default
Log Message:
No forking happens in embedded.
diffs (25 lines):
diff --git a/sql/backends/monet5/UDF/pyapi/conversion.c
b/sql/backends/monet5/UDF/pyapi/conversion.c
--- a/sql/backends/monet5/UDF/pyapi/conversion.c
+++ b/sql/backends/monet5/UDF/pyapi/conversion.c
@@ -4,7 +4,9 @@
#include "pytypes.h"
#include "type_conversion.h"
#include "unicode.h"
+#ifndef HAVE_EMBEDDED
#include "gdk_interprocess.h"
+#endif
CREATE_SQL_FUNCTION_PTR(str,batbte_dec2_dbl);
CREATE_SQL_FUNCTION_PTR(str,batsht_dec2_dbl);
diff --git a/sql/backends/monet5/UDF/pyapi/convert_loops.h
b/sql/backends/monet5/UDF/pyapi/convert_loops.h
--- a/sql/backends/monet5/UDF/pyapi/convert_loops.h
+++ b/sql/backends/monet5/UDF/pyapi/convert_loops.h
@@ -26,7 +26,7 @@
// This #define creates a new BAT with the internal data and mask from a Numpy
array, without copying the data
// 'bat' is a BAT* pointer, which will contain the new BAT. TYPE_'mtpe' is the
BAT type, and 'batstore' is the heap storage type of the BAT (this should be
STORE_CMEM or STORE_SHARED)
-#ifdef HAVE_FORK
+#if defined (HAVE_FORK) && !defined(HAVE_EMBEDDED)
#define CREATE_BAT_ZEROCOPY(bat, mtpe, batstore) {
\
bat = COLnew(seqbase, TYPE_##mtpe, 0, TRANSIENT);
\
bat->tnil = 0; bat->tnonil = 1;
\
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
