diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-28 13:15:44 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-28 13:15:44 (GMT) |
| commit | a5162e47d57e9549fb2ee179f87823dcc11a7be7 (patch) | |
| tree | 2f7ef7246069b68d1c14e924dfa28b73f0f6d84b | |
| parent | bc00595941b47c836cd12def3bf19235959a23d1 (diff) | |
| parent | 122bb72a66973fecc8939b5bb376d2b65334738b (diff) | |
| download | tcl-a5162e47d57e9549fb2ee179f87823dcc11a7be7.zip tcl-a5162e47d57e9549fb2ee179f87823dcc11a7be7.tar.gz tcl-a5162e47d57e9549fb2ee179f87823dcc11a7be7.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | win/makefile.vc | 2 | ||||
| -rw-r--r-- | win/rules.vc | 13 | ||||
| -rw-r--r-- | win/tclWinPort.h | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 9c5e7f6..26504bc 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -431,7 +431,7 @@ PKGSDIR = $(ROOT)\pkgs # Additional include and C macro definitions for the implicit rules
# defined in rules.vc
PRJ_INCLUDES = -I"$(TOMMATHDIR)"
-PRJ_DEFINES = /DTCL_TOMMATH /DMP_PREC=4 /Dinline=__inline /DHAVE_ZLIB=1 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DMP_FIXED_CUTOFFS /DMP_NO_STDINT /DMP_WUR=
+PRJ_DEFINES = /DTCL_TOMMATH /DMP_PREC=4 /Dinline=__inline /DHAVE_ZLIB=1 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DMP_FIXED_CUTOFFS /DMP_WUR=
# Additional Link libraries needed beyond those in rules.vc
PRJ_LIBS = netapi32.lib user32.lib userenv.lib ws2_32.lib
diff --git a/win/rules.vc b/win/rules.vc index 50911d4..1206677 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -24,7 +24,7 @@ _RULES_VC = 1 # For modifications that are not backward-compatible, you *must* change
# the major version.
RULES_VERSION_MAJOR = 1
-RULES_VERSION_MINOR = 5
+RULES_VERSION_MINOR = 6
# The PROJECT macro must be defined by parent makefile.
!if "$(PROJECT)" == ""
@@ -1282,6 +1282,17 @@ INCLUDE_INSTALL_DIR = $(_INSTALLDIR)\..\include # define PRJ_LIBS before including rules.rc if additional libs are needed
OPTDEFINES = /DTCL_CFGVAL_ENCODING=$(CFG_ENCODING) /DSTDC_HEADERS
+!if $(VCVERSION) >= 1600
+OPTDEFINES = $(OPTDEFINES) /DHAVE_STDINT_H=1
+!else
+OPTDEFINES = $(OPTDEFINES) /DMP_NO_STDINT=1
+!endif
+!if $(VCVERSION) >= 1700
+OPTDEFINES = $(OPTDEFINES) /DHAVE_INTTYPES_H=1
+!endif
+!if $(VCVERSION) >= 1800
+OPTDEFINES = $(OPTDEFINES) /DHAVE_STDBOOL_H=1
+!endif
!if $(TCL_MEM_DEBUG)
OPTDEFINES = $(OPTDEFINES) /DTCL_MEM_DEBUG
diff --git a/win/tclWinPort.h b/win/tclWinPort.h index 774a0a4..49b1a67 100644 --- a/win/tclWinPort.h +++ b/win/tclWinPort.h @@ -83,7 +83,7 @@ typedef DWORD_PTR * PDWORD_PTR; #include <malloc.h> #include <process.h> #include <signal.h> -#if HAVE_INTTYPES_H +#ifdef HAVE_INTTYPES_H # include <inttypes.h> #endif #include <limits.h> |