Also conditionally include headers. Remove more ifdefs

mmtk · Nov 26, 2024 · 2466414 · 2466414
1 parent b5966dc
commit 2466414
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 20 deletions.
diff --git a/src/Makefile b/src/Makefile
@@ -118,7 +118,12 @@ ifeq ($(USE_SYSTEM_LIBUV),0)
 UV_HEADERS += uv.h
 UV_HEADERS += uv/*.h
 endif
-PUBLIC_HEADERS := $(BUILDDIR)/julia_version.h $(wildcard $(SRCDIR)/support/*.h) $(addprefix $(SRCDIR)/,work-stealing-queue.h gc-interface.h gc-tls.h gc-tls-common.h gc-tls-mmtk.h julia.h julia_assert.h julia_threads.h julia_fasttls.h julia_locks.h julia_atomics.h jloptions.h)
+PUBLIC_HEADERS := $(BUILDDIR)/julia_version.h $(wildcard $(SRCDIR)/support/*.h) $(addprefix $(SRCDIR)/,work-stealing-queue.h gc-interface.h gc-tls-common.h julia.h julia_assert.h julia_threads.h julia_fasttls.h julia_locks.h julia_atomics.h jloptions.h)
+ifeq ($(WITH_MMTK), 1)
+	PUBLIC_HEADERS += $(addprefix $(SRCDIR)/,gc-tls-mmtk.h)
+else
+	PUBLIC_HEADERS += $(addprefix $(SRCDIR)/,gc-tls-stock.h)
+endif
 ifeq ($(OS),WINNT)
 PUBLIC_HEADERS += $(addprefix $(SRCDIR)/,win32_ucontext.h)
 endif

diff --git a/src/gc-mmtk.h b/src/gc-mmtk.h
@@ -1,5 +1,3 @@
-#ifdef MMTK_GC
-
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
@@ -30,5 +28,3 @@ JL_EXTENSION typedef struct _bigval_t {
 #ifdef __cplusplus
 }
 #endif
-
-#endif // MMTK_GC
diff --git a/src/gc-stacks.c b/src/gc-stacks.c
@@ -1,7 +1,6 @@
 // This file is a part of Julia. License is MIT: https://julialang.org/license
 
 #include "gc-common.h"
-#include "gc-stock.h"
 #include "threading.h"
 #ifndef _OS_WINDOWS_
 #  include <sys/resource.h>

diff --git a/src/gc-stock.h b/src/gc-stock.h
@@ -5,8 +5,6 @@
   . non-moving, precise mark and sweep collector
   . pool-allocates small objects, keeps big objects on a simple list
 */
-#ifndef MMTK_GC
-
 #ifndef JL_GC_H
 #define JL_GC_H
 
@@ -727,6 +725,3 @@ void _report_gc_finished(uint64_t pause, uint64_t freed, int full, int recollect
 #endif
 
 #endif
-
-
-#endif // !MMTK_GC
diff --git a/src/gc-tls-mmtk.h b/src/gc-tls-mmtk.h
@@ -1,7 +1,5 @@
 // This file is a part of Julia. License is MIT: https://julialang.org/license
 
-#ifdef MMTK_GC
-
 #include <assert.h>
 #include "mmtkMutator.h"
 
@@ -17,5 +15,3 @@ typedef struct {
 #ifdef __cplusplus
 }
 #endif
-
-#endif // MMTK_GC
diff --git a/src/gc-tls.h → src/gc-tls-stock.h b/src/gc-tls.h → src/gc-tls-stock.h
@@ -1,7 +1,5 @@
 // This file is a part of Julia. License is MIT: https://julialang.org/license
 
-#ifndef MMTK_GC
-
 // Meant to be included in "julia_threads.h"
 #ifndef JL_GC_TLS_H
 #define JL_GC_TLS_H
@@ -68,5 +66,3 @@ typedef struct {
 #endif
 
 #endif // JL_GC_TLS_H
-
-#endif // MMTK_GC
diff --git a/src/julia_threads.h b/src/julia_threads.h
@@ -5,7 +5,7 @@
 #define JL_THREADS_H
 
 #ifndef MMTK_GC
-#include "gc-tls.h"
+#include "gc-tls-stock.h"
 #else
 #include "gc-tls-mmtk.h"
 #endif