summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2009-06-30 14:21:44 (GMT)
committerdas <das>2009-06-30 14:21:44 (GMT)
commite814abdc993285f2a35a00be2a89b45874d0598b (patch)
treedaf99d6797af0f38f91669cc186364c08d9c3c4b
parentcddcc530147879e27bcf91025fc6728fb087d8e2 (diff)
downloadtk-e814abdc993285f2a35a00be2a89b45874d0598b.zip
tk-e814abdc993285f2a35a00be2a89b45874d0598b.tar.gz
tk-e814abdc993285f2a35a00be2a89b45874d0598b.tar.bz2
s/Tcl_PanicEx/TclPanic/; improve clang assert Tcl_Panic macrology
-rw-r--r--generic/tkInt.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h
index 672160c..b5072be 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: $Id: tkInt.h,v 1.104 2009/06/30 00:56:29 das Exp $
+ * RCS: $Id: tkInt.h,v 1.105 2009/06/30 14:21:44 das Exp $
*/
#ifndef _TKINT
@@ -988,9 +988,9 @@ MODULE_SCOPE Tcl_HashTable tkPredefBitmapTable;
#if defined(PURIFY) && defined(__clang__) && !defined(CLANG_ASSERT)
#include <assert.h>
#define CLANG_ASSERT(x) assert(x)
-#define Tcl_PanicEx Tcl_Panic
+#define TclPanic Tcl_Panic
#undef Tcl_Panic
-#define Tcl_Panic(f, ...) Tcl_PanicEx(f,##__VA_ARGS__); CLANG_ASSERT(0)
+#define Tcl_Panic(f, ...) do { TclPanic(f,##__VA_ARGS__); CLANG_ASSERT(0); } while(0)
#elif !defined(CLANG_ASSERT)
#define CLANG_ASSERT(x)
#endif