From a8d1e5187d98cf5d0e776415ae16e73a5475fbc9 Mon Sep 17 00:00:00 2001
From: Phil Dawes <phil@phildawes.net>
Date: Mon, 7 Sep 2009 08:18:41 +0100
Subject: [PATCH] Added -DREENTRANT option to Makefile

Also renamed FACTOR_MULTITHREADED to FACTOR_REENTRANT
---
 Makefile  | 4 ++++
 vm/vm.hpp | 9 +++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index bfaa6ec7a3..10efe34d34 100755
--- 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 3c0f4a246b..e4cd633fb1 100644
--- 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
-- 
2.34.1