summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorKevin B Kenny <kennykb@acm.org>2010-12-16 01:42:18 (GMT)
committerKevin B Kenny <kennykb@acm.org>2010-12-16 01:42:18 (GMT)
commit7c4049a13f83930bf6a57ef889abc9e49fa414ec (patch)
tree04a1e8720b0aa6ceec87313717f33b65a0406f9c /generic
parentbd15a677a69c007725ead1fa693994c3391e6d73 (diff)
downloadtcl-7c4049a13f83930bf6a57ef889abc9e49fa414ec.zip
tcl-7c4049a13f83930bf6a57ef889abc9e49fa414ec.tar.gz
tcl-7c4049a13f83930bf6a57ef889abc9e49fa414ec.tar.bz2
merge
Diffstat (limited to 'generic')
-rw-r--r--generic/tcl.h4
-rw-r--r--generic/tclPanic.c11
2 files changed, 5 insertions, 10 deletions
diff --git a/generic/tcl.h b/generic/tcl.h
index 27ed895..fd67dd4 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tcl.h,v 1.308.2.1 2010/12/11 18:39:28 kennykb Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.308.2.2 2010/12/16 01:42:18 kennykb Exp $
*/
#ifndef _TCL
@@ -190,7 +190,7 @@ extern "C" {
# endif
#else
# define DLLIMPORT
-# if defined(__GNUC__) && __GNUC__ > 3
+# if defined(__GNUC__) && !defined(NO_VIZ) && !defined(STATIC_BUILD)
# define DLLEXPORT __attribute__ ((visibility("default")))
# else
# define DLLEXPORT
diff --git a/generic/tclPanic.c b/generic/tclPanic.c
index 70d37a1..e8c1257 100644
--- a/generic/tclPanic.c
+++ b/generic/tclPanic.c
@@ -12,11 +12,10 @@
* 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.14.4.1 2010/12/01 16:42:36 kennykb Exp $
+ * RCS: @(#) $Id: tclPanic.c,v 1.14.4.2 2010/12/16 01:42:18 kennykb Exp $
*/
#include "tclInt.h"
-#undef Tcl_Panic
/*
* The panicProc variable contains a pointer to an application specific panic
@@ -90,13 +89,9 @@ Tcl_PanicVA(
arg8);
fprintf(stderr, "\n");
fflush(stderr);
-#ifdef _WIN32
- DebugBreak();
- ExitProcess(1);
-#else
- abort();
-#endif
}
+ /* In case the users panic proc does not abort, we do it here */
+ abort();
}
/*