Added -DREENTRANT option to Makefile
Also renamed FACTOR_MULTITHREADED to FACTOR_REENTRANT
parent
f7584cd826
commit
3db680547a
4
Makefile
4
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)
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue