diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-07-06 12:00:35 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-07-06 12:00:35 (GMT) |
| commit | 698d338b0f99491fa29224dbfa20aabad7efad67 (patch) | |
| tree | 0d82925d246872e732646e7ab48ae4193e5d867d /generic/tclBasic.c | |
| parent | 11f905cd0ac504734130b3c41a7b434b83557b7c (diff) | |
| parent | 20c87d8e2377d5d7f88a6f170e92e5a70fbddf3b (diff) | |
| download | tcl-698d338b0f99491fa29224dbfa20aabad7efad67.zip tcl-698d338b0f99491fa29224dbfa20aabad7efad67.tar.gz tcl-698d338b0f99491fa29224dbfa20aabad7efad67.tar.bz2 | |
Merge 8.7. Provide both major and minor version number for gcc/clang/msvc
Diffstat (limited to 'generic/tclBasic.c')
| -rw-r--r-- | generic/tclBasic.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index d1e6fe2..34e7985 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -1183,7 +1183,6 @@ Tcl_CreateInterp(void) */ Tcl_PkgProvideEx(interp, "Tcl", TCL_PATCH_LEVEL -#if defined(TCL_NO_DEPRECATED) || TCL_MAJOR_VERSION > 8 "+" STRINGIFY(TCL_VERSION_UUID) #ifdef TCL_COMPILE_DEBUG ".compiledebug" @@ -1192,28 +1191,39 @@ Tcl_CreateInterp(void) ".compilestats" #endif #if defined(__clang__) && defined(__clang_major__) - ".clang" STRINGIFY(__clang_major__) + ".clang-" STRINGIFY(__clang_major__) +#if __clang_minor__ < 10 + "0" +#endif + STRINGIFY(__clang_minor__) #endif #ifndef NDEBUG ".debug" #endif #if !defined(__clang__) && defined(__GNUC__) - ".gcc" STRINGIFY(__GNUC__) + ".gcc-" STRINGIFY(__GNUC__) +#if __GNUC_MINOR__ < 10 + "0" +#endif + STRINGIFY(__GNUC_MINOR__) #endif #ifdef TCL_MEM_DEBUG ".memdebug" #endif #if defined(_MSC_VER) - ".msvc" STRINGIFY(_MSC_VER) + ".msvc-" STRINGIFY(_MSC_VER) +#endif +#ifdef USE_NMAKE + ".nmake" #endif #ifdef TCL_NO_DEPRECATED - ".nodeprecate" + ".no-deprecate" #endif #ifndef TCL_THREADS - ".nothread" + ".no-thread" #endif #ifndef TCL_CFG_OPTIMIZED - ".nooptimize" + ".no-optimize" #endif #ifdef TCL_CFG_PROFILED ".profiled" @@ -1224,7 +1234,6 @@ Tcl_CreateInterp(void) #if TCL_UTF_MAX < 4 ".utf16" #endif -#endif /* TCL_NO_DEPRECATED || TCL_MAJOR_VERSION > 8 */ , &tclStubs); if (TclTommath_Init(interp) != TCL_OK) { |