swiftlang · hmelder · Oct 24, 2025 · Oct 24, 2025 · Oct 24, 2025 · Oct 24, 2025
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -58,7 +58,7 @@ add_library(BlocksRuntime
 
 if(WIN32)
   target_sources(BlocksRuntime PRIVATE
-    BlocksRuntime.def)
+    src/BlocksRuntime/BlocksRuntime.def)
 
   if(NOT BUILD_SHARED_LIBS)
     target_compile_definitions(BlocksRuntime PUBLIC BlocksRuntime_STATIC)

diff --git a/src/BlocksRuntime/Block.h b/src/BlocksRuntime/Block.h
@@ -52,13 +52,8 @@ BLOCK_EXPORT void _Block_object_assign(void *, const void *, const int);
 BLOCK_EXPORT void _Block_object_dispose(const void *, const int);
 
 // Used by the compiler. Do not use these variables yourself.
-#if defined(_WIN32)
-extern void * _NSConcreteGlobalBlock[32];
-extern void * _NSConcreteStackBlock[32];
-#else
 BLOCK_EXPORT void * _NSConcreteGlobalBlock[32];
 BLOCK_EXPORT void * _NSConcreteStackBlock[32];
-#endif
 
 #if __cplusplus
 }

diff --git a/src/BlocksRuntime/BlocksRuntime.def b/src/BlocksRuntime/BlocksRuntime.def
@@ -2,3 +2,7 @@ LIBRARY BlocksRuntime
 EXPORTS
   _NSConcreteGlobalBlock CONSTANT
   _NSConcreteStackBlock CONSTANT
+  _NSConcreteMallocBlock CONSTANT
+  _NSConcreteAutoBlock CONSTANT
+  _NSConcreteFinalizingBlock CONSTANT
+  _NSConcreteWeakBlockVariable CONSTANT
diff --git a/src/BlocksRuntime/CMakeLists.txt b/src/BlocksRuntime/CMakeLists.txt