diff options
| author | nijtmans <nijtmans> | 2011-01-12 07:48:29 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2011-01-12 07:48:29 (GMT) |
| commit | 0698ee28a98695fb1602967f15c730b776b0dba6 (patch) | |
| tree | 49382e51efa79b4e4ae6f239b9e129e5f1b61f0b | |
| parent | 3b161d98427064651cababcdfa1c11ba2a54399e (diff) | |
| download | tcl-0698ee28a98695fb1602967f15c730b776b0dba6.zip tcl-0698ee28a98695fb1602967f15c730b776b0dba6.tar.gz tcl-0698ee28a98695fb1602967f15c730b776b0dba6.tar.bz2 | |
VS 2005 64-bit does not have intrin.h, and does not need it.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | generic/tclPanic.c | 11 |
2 files changed, 5 insertions, 8 deletions
@@ -3,7 +3,7 @@ * win/tclWinFile.c: Use _vsnprintf in stead of vsnprintf, because MSVC 6 doesn't have it. Reported by andreask. * win/tclWin32Dll.c: VS 2005 64-bit does not have intrin.h, and - does not need it. + * generic/tclPanic.c: does not need it. 2011-01-07 Kevin B. Kenny <kennykb@acm.org> diff --git a/generic/tclPanic.c b/generic/tclPanic.c index ad17360..035edd5 100644 --- a/generic/tclPanic.c +++ b/generic/tclPanic.c @@ -12,14 +12,11 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclPanic.c,v 1.19 2010/12/20 10:28:48 nijtmans Exp $ + * RCS: @(#) $Id: tclPanic.c,v 1.20 2011/01/12 07:48:29 nijtmans Exp $ */ #include "tclInt.h" #ifdef _WIN32 -# ifdef HAVE_INTRIN_H -# include <intrin.h> -# endif MODULE_SCOPE void tclWinDebugPanic(const char *format, ...); #endif @@ -106,10 +103,10 @@ Tcl_PanicVA( } /* In case the users panic proc does not abort, we do it here */ #ifdef _WIN32 -# ifdef HAVE_INTRIN_H - __debugbreak(); -# elif defined(__GNUC__) +# if defined(__GNUC__) __builtin_trap(); +# elif defined(_MSC_VER) + __debugbreak(); # else DebugBreak(); # endif |