summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2008-06-19 00:14:56 (GMT)
committerdas <das>2008-06-19 00:14:56 (GMT)
commit5286e8878dc30776fcb769e9533d2e936daf6af0 (patch)
treedbe6dc92aa6aaa414056b51e406bea7e2ab7c25b
parentf5d537eea87cc6e9a91436cd00a8a1e3447db700 (diff)
downloadtk-5286e8878dc30776fcb769e9533d2e936daf6af0.zip
tk-5286e8878dc30776fcb769e9533d2e936daf6af0.tar.gz
tk-5286e8878dc30776fcb769e9533d2e936daf6af0.tar.bz2
* macosx/tkMacOSXDebug.c: revert 2007-11-09 commit making
* macosx/tkMacOSXDebug.h: TkMacOSXInitNamedDebugSymbol() available outside of debug builds.
-rw-r--r--macosx/tkMacOSXDebug.c5
-rw-r--r--macosx/tkMacOSXDebug.h6
2 files changed, 6 insertions, 5 deletions
diff --git a/macosx/tkMacOSXDebug.c b/macosx/tkMacOSXDebug.c
index 4d4e695..740922b 100644
--- a/macosx/tkMacOSXDebug.c
+++ b/macosx/tkMacOSXDebug.c
@@ -54,7 +54,7 @@
* software in accordance with the terms specified in this
* license.
*
- * RCS: @(#) $Id: tkMacOSXDebug.c,v 1.19 2007/12/13 15:27:08 dgp Exp $
+ * RCS: @(#) $Id: tkMacOSXDebug.c,v 1.20 2008/06/19 00:14:56 das Exp $
*/
#include "tkMacOSXPrivate.h"
@@ -478,7 +478,6 @@ TkMacOSXDebugFlashRegion(
}
}
}
-#endif /* TK_MAC_DEBUG */
#include <mach-o/dyld.h>
#include <mach-o/nlist.h>
@@ -616,3 +615,5 @@ TkMacOSXGetNamedDebugSymbol(
#endif /* __LP64__ */
return addr;
}
+
+#endif /* TK_MAC_DEBUG */
diff --git a/macosx/tkMacOSXDebug.h b/macosx/tkMacOSXDebug.h
index e5935f0..da964f9 100644
--- a/macosx/tkMacOSXDebug.h
+++ b/macosx/tkMacOSXDebug.h
@@ -54,7 +54,7 @@
* software in accordance with the terms specified in this
* license.
*
- * RCS: @(#) $Id: tkMacOSXDebug.h,v 1.15 2007/12/13 15:27:08 dgp Exp $
+ * RCS: @(#) $Id: tkMacOSXDebug.h,v 1.16 2008/06/19 00:14:56 das Exp $
*/
#ifndef _TKMACDEBUG
@@ -84,8 +84,6 @@ MODULE_SCOPE char* TkMacOSXMouseTrackingResultToAscii(MouseTrackingResult r, cha
MODULE_SCOPE void TkMacOSXDebugFlashRegion(Drawable d, HIShapeRef rgn);
-#endif /* TK_MAC_DEBUG */
-
MODULE_SCOPE void* TkMacOSXGetNamedDebugSymbol(const char* module, const char* symbol);
/* Macro to abstract common use of TkMacOSXGetNamedDebugSymbol to initialize named symbols */
@@ -95,4 +93,6 @@ MODULE_SCOPE void* TkMacOSXGetNamedDebugSymbol(const char* module, const char* s
symbol = TkMacOSXGetNamedDebugSymbol(STRINGIFY(module), STRINGIFY(_##symbol));\
}
+#endif /* TK_MAC_DEBUG */
+
#endif