diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-10-05 11:24:01 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-10-05 11:24:01 (GMT) |
| commit | 1ac5bc1c98b345bfcc00d037828fc5cf0ca93b15 (patch) | |
| tree | 68c0928c9826b336819d0766769d6dccc0ce3103 /generic/tclBasic.c | |
| parent | 2b64ea7f2470e4727e2d79c041ba0028371c7a9e (diff) | |
| parent | 22a204efc2b5de6e1fd336e14c6350e5f8ceb9a8 (diff) | |
| download | tcl-1ac5bc1c98b345bfcc00d037828fc5cf0ca93b15.zip tcl-1ac5bc1c98b345bfcc00d037828fc5cf0ca93b15.tar.gz tcl-1ac5bc1c98b345bfcc00d037828fc5cf0ca93b15.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclBasic.c')
| -rw-r--r-- | generic/tclBasic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 4f43ca5..83f6b4e 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -69,7 +69,7 @@ * compatible with AddressSanitizer (ASan) use-after-return detection. */ -#if defined(HAVE_INTRIN_H) +#if defined(_MSC_VER) && defined(HAVE_INTRIN_H) #include <intrin.h> /* for _AddressOfReturnAddress() */ #endif @@ -84,10 +84,10 @@ void * TclGetCStackPtr(void) { -#if defined(HAVE_INTRIN_H) - return _AddressOfReturnAddress(); -#elif __GNUC__ || __has_builtin(__builtin_frame_address) +#if defined( __GNUC__ ) || __has_builtin(__builtin_frame_address) return __builtin_frame_address(0); +#elif defined(_MSC_VER) && defined(HAVE_INTRIN_H) + return _AddressOfReturnAddress(); #else ptrdiff_t unused = 0; /* |