summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authornijtmans <nijtmans>2011-01-12 07:48:29 (GMT)
committernijtmans <nijtmans>2011-01-12 07:48:29 (GMT)
commit0698ee28a98695fb1602967f15c730b776b0dba6 (patch)
tree49382e51efa79b4e4ae6f239b9e129e5f1b61f0b /generic
parent3b161d98427064651cababcdfa1c11ba2a54399e (diff)
downloadtcl-0698ee28a98695fb1602967f15c730b776b0dba6.zip
tcl-0698ee28a98695fb1602967f15c730b776b0dba6.tar.gz
tcl-0698ee28a98695fb1602967f15c730b776b0dba6.tar.bz2
VS 2005 64-bit does not have intrin.h, and does not need it.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclPanic.c11
1 files changed, 4 insertions, 7 deletions
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