Merge remote-tracking branch 'whippet/main' into wip-whippet

libguile/whippet/src/bdw.c

@@ -3,11 +3,12 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define GC_IMPL 1
+
 #include "gc-api.h"
 #include "gc-ephemeron.h"
 #include "gc-tracepoint.h"
 
-#define GC_IMPL 1
 #include "gc-internal.h"
 
 #include "bdw-attrs.h"

libguile/whippet/src/embedder-api-impl.h

@@ -0,0 +1,12 @@
+#ifndef EMBEDDER_API_IMPL_H
+#define EMBEDDER_API_IMPL_H
+
+#include "gc-embedder-api.h"
+
+#ifndef GC_EMBEDDER
+#define GC_EMBEDDER "whippet-embedder.h"
+#endif
+
+#include GC_EMBEDDER
+
+#endif // EMBEDDER_API_IMPL_H

libguile/whippet/src/gc-ephemeron.c

@@ -6,7 +6,7 @@
 
 #include "address-hash.h"
 #include "debug.h"
-#include "gc-embedder-api.h"
+#include "embedder-api-impl.h"
 #include "gc-ephemeron-internal.h"
 
 // # Overview

libguile/whippet/src/gc-finalizer.c

@@ -6,7 +6,7 @@
 #define GC_IMPL 1
 
 #include "debug.h"
-#include "gc-embedder-api.h"
+#include "embedder-api-impl.h"
 #include "gc-ephemeron-internal.h" // for gc_visit_ephemeron_key
 #include "gc-finalizer-internal.h"
 

libguile/whippet/src/gc-internal.h

@@ -5,6 +5,7 @@
 #error internal header file, not part of API
 #endif
 
+#include "embedder-api-impl.h"
 #include "gc-ephemeron-internal.h"
 #include "gc-finalizer-internal.h"
 #include "gc-options-internal.h"