Make revised_text build when TK_CHECK_ALLOCS is defined.

tcltk · Dec 5, 2024 · a54d54a · a54d54a
1 parent 311fe4e
commit a54d54a
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/generic/tkBitField.h b/generic/tkBitField.h
@@ -12,6 +12,8 @@
 #ifndef _TKBITFIELD
 #define _TKBITFIELD
 
+/* #define TK_CHECK_ALLOCS */
+
 #include "tkInt.h" /* needed for inline support and 64 bit support */
 
 #if (UINTPTR_MAX >= 0xffffffffffffffffu)

diff --git a/generic/tkIntSet.h b/generic/tkIntSet.h
@@ -12,6 +12,8 @@
 #ifndef _TKINTSET
 #define _TKINTSET
 
+/* #define TK_CHECK_ALLOCS */
+
 #include "tkInt.h" /* required for inline support */
 
 #if defined(__GNUC__) || defined(__clang__)

diff --git a/generic/tkRangeList.h b/generic/tkRangeList.h
@@ -15,6 +15,8 @@
 #ifndef _TKRANGELIST
 #define _TKRANGELIST
 
+/* #define TK_CHECK_ALLOCS */
+
 #include "tkInt.h" /* required for inline support */
 
 #if defined(__GNUC__) || defined(__clang__)

diff --git a/generic/tkText.c b/generic/tkText.c
@@ -627,7 +627,7 @@ static unsigned widgetNumber = 0;
 static WatchShared *watchShared;
 
 static void
-AllocStatistic()
+AllocStatistic(void)
 {
     const WatchShared *wShared;
 
@@ -639,7 +639,7 @@ AllocStatistic()
 	const TkText *peer;
 
 	for (peer = wShared->sharedTextPtr->peers; peer; peer = peer->next) {
-	    fprintf(stderr, "Unreleased text widget %d\n", peer->widgetNumber);
+	    fprintf(stderr, "Unreleased text widget %zd\n", peer->widgetNumber);
 	}
     }
 

diff --git a/generic/tkText.h b/generic/tkText.h
@@ -14,6 +14,8 @@
 #ifndef _TKTEXT
 #define _TKTEXT
 
+/* #define TK_CHECK_ALLOCS */
+
 #ifndef _TKINT
 # include "tkInt.h"
 #endif

diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
@@ -853,7 +853,7 @@ typedef struct Statistic {
 static Statistic stats;
 
 static void
-PerfStatistic()
+PerfStatistic(void)
 {
     if (!tkBTreeDebug) {
 	return;
@@ -903,7 +903,7 @@ extern unsigned tkRangeListCountDestroy;
 static int hookStatFunc = 1;
 
 static void
-AllocStatistic()
+AllocStatistic(void)
 {
     if (!tkBTreeDebug) {
 	return;
@@ -1662,9 +1662,7 @@ TkTextCreateDInfo(
 #endif
 #ifndef NDEBUG
     if (!stats.perfFuncIsHooked) {
-#ifndef _MSC_VER	/* MSVC erroneously triggers warning warning C4113 */
 	atexit(PerfStatistic);
-#endif
 	stats.perfFuncIsHooked = 1;
     }
 #endif