diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-04 10:50:49 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-04 10:50:49 (GMT) |
| commit | e583aab8c93cf6a1c2bd747295996e83667b6bf8 (patch) | |
| tree | 9138407d1ace4451956c2cd1b1913019021843b0 | |
| parent | a52cfae90040fcfebac8aef0c52731bd67864165 (diff) | |
| download | tcl-e583aab8c93cf6a1c2bd747295996e83667b6bf8.zip tcl-e583aab8c93cf6a1c2bd747295996e83667b6bf8.tar.gz tcl-e583aab8c93cf6a1c2bd747295996e83667b6bf8.tar.bz2 | |
When using Tcl 8.7 headers, don't worry about threaded-allocator mismatch any more in rules.vc.
| -rw-r--r-- | win/rules.vc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/win/rules.vc b/win/rules.vc index b1a0346..4662b00 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -1293,9 +1293,9 @@ OPTDEFINES = $(OPTDEFINES) -DTCL_MEM_DEBUG !if $(TCL_COMPILE_DEBUG)
OPTDEFINES = $(OPTDEFINES) -DTCL_COMPILE_DEBUG -DTCL_COMPILE_STATS
!endif
-!if $(TCL_THREADS) && $(TCL_VERSION) <= 86
+!if $(TCL_THREADS) && $(TCL_VERSION) < 87
OPTDEFINES = $(OPTDEFINES) -DTCL_THREADS=1
-!if $(USE_THREAD_ALLOC)
+!if $(USE_THREAD_ALLOC) && $(TCL_VERSION) < 87
OPTDEFINES = $(OPTDEFINES) -DUSE_THREAD_ALLOC=1
!endif
!endif
@@ -1775,7 +1775,7 @@ TCLNMAKECONFIG = "$(OUT_DIR)\tcl.nmake" !if defined(CORE_MACHINE) && "$(CORE_MACHINE)" != "$(MACHINE)"
!error ERROR: Build target ($(MACHINE)) does not match the Tcl library architecture ($(CORE_MACHINE)).
!endif
-!if defined(CORE_USE_THREAD_ALLOC) && $(CORE_USE_THREAD_ALLOC) != $(USE_THREAD_ALLOC)
+!if $(TCL_VERSION) < 87 && defined(CORE_USE_THREAD_ALLOC) && $(CORE_USE_THREAD_ALLOC) != $(USE_THREAD_ALLOC)
!message WARNING: Value of USE_THREAD_ALLOC ($(USE_THREAD_ALLOC)) does not match its Tcl core value ($(CORE_USE_THREAD_ALLOC)).
!endif
!if defined(CORE_DEBUG) && $(CORE_DEBUG) != $(DEBUG)
|