Changeset: ef2cd994ac3d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ef2cd994ac3d
Modified Files:
gdk/gdk_batop.c
gdk/gdk_system.h
Branch: Dec2023
Log Message:
Merge with Jun2023 branch.
diffs (42 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -139,7 +139,7 @@ insert_string_bat(BAT *b, BATiter *ni, s
}
MT_lock_set(&b->theaplock);
- if (HEAPgrow(&b->tvheap, toff + ni->vh->size,
force) != GDK_SUCCEED) {
+ if (HEAPgrow(&b->tvheap, toff + ni->vhfree,
force) != GDK_SUCCEED) {
MT_lock_unset(&b->theaplock);
return GDK_FAIL;
}
diff --git a/gdk/gdk_system.h b/gdk/gdk_system.h
--- a/gdk/gdk_system.h
+++ b/gdk/gdk_system.h
@@ -120,6 +120,26 @@
# include <semaphore.h>
#endif
+#if defined(__APPLE__) && defined(__GNUC__)
+/* GCC-12 installed with Homebrew on MacOS has a bug which makes
+ * including <dispatch/dispatch.h> impossible. However we need that for
+ * properly working semaphores, so we have this bit of code to work
+ * around the bug. */
+#define HAVE_DISPATCH_DISPATCH_H 1
+#define HAVE_DISPATCH_SEMAPHORE_CREATE 1
+#if __has_attribute(__swift_attr__)
+#define OS_SWIFT_UNAVAILABLE_FROM_ASYNC(msg) \
+ __attribute__((__swift_attr__("@_unavailableFromAsync(message: \"" msg
"\")")))
+#else
+#define OS_SWIFT_UNAVAILABLE_FROM_ASYNC(msg)
+#endif
+#define OS_ASSUME_PTR_ABI_SINGLE_BEGIN __ASSUME_PTR_ABI_SINGLE_BEGIN
+#define OS_ASSUME_PTR_ABI_SINGLE_END __ASSUME_PTR_ABI_SINGLE_END
+#define OS_UNSAFE_INDEXABLE __unsafe_indexable
+#define OS_HEADER_INDEXABLE __header_indexable
+#define OS_COUNTED_BY(N) __counted_by(N)
+#define OS_SIZED_BY(N) __sized_by(N)
+#endif
#ifdef HAVE_DISPATCH_DISPATCH_H
#include <dispatch/dispatch.h>
#endif
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
