Added -DREENTRANT option to Makefile

Also renamed FACTOR_MULTITHREADED to FACTOR_REENTRANT

diff --git a/Makefile b/Makefile
index bfaa6ec7a38736a091e7b2de7e5d8738d133d382..10efe34d34fe83560b92d6d653c0a861f377633a 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ else
        CFLAGS += -O3
 endif
 
+ifdef REENTRANT
+       CFLAGS += -DFACTOR_REENTRANT
+endif
+
 CFLAGS += $(SITE_CFLAGS)
 
 ENGINE = $(DLL_PREFIX)factor$(DLL_SUFFIX)$(DLL_EXTENSION)

diff --git a/vm/vm.hpp b/vm/vm.hpp
index 3c0f4a246b70cc8dba6c91eed685342e47837132..e4cd633fb18eaf27bd66c0975edd09f698e3122e 100644 (file)
--- a/vm/vm.hpp
+++ b/vm/vm.hpp
@@ -610,8 +610,9 @@ struct factorvm : factorvmdata {
 };
 
 
-
-#define FACTOR_SINGLE_THREADED_SINGLETON
+#ifndef FACTOR_REENTRANT
+   #define FACTOR_SINGLE_THREADED_SINGLETON
+#endif
 
 #ifdef FACTOR_SINGLE_THREADED_SINGLETON
 /* calls are dispatched using the singleton vm ptr */
@@ -633,7 +634,7 @@ struct factorvm : factorvmdata {
   #define SIGNAL_VM_PTR() tls_vm()
 #endif
 
-#ifdef FACTOR_MULTITHREADED_TLS
+#ifdef FACTOR_REENTRANT_TLS
 /* uses thread local storage to obtain vm ptr */
   #define PRIMITIVE_GETVM() tls_vm()
   #define PRIMITIVE_OVERFLOW_GETVM() tls_vm()
@@ -642,7 +643,7 @@ struct factorvm : factorvmdata {
   #define SIGNAL_VM_PTR() tls_vm()
 #endif
 
-#ifdef FACTOR_MULTITHREADED
+#ifdef FACTOR_REENTRANT
   #define PRIMITIVE_GETVM() ((factorvm*)myvm)
   #define PRIMITIVE_OVERFLOW_GETVM() ((factorvm*)myvm)
   #define VM_PTR myvm