summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2025-09-18 13:32:46 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2025-09-18 13:32:46 (GMT)
commit70104e9f5f70cdf013c07fb923e56df215cf4ac3 (patch)
tree778ca2e2d12b1a65ee539b151f7121a144bfac5d
parentd9c1e8eef1830f14c4969cd7b7cdb5b560d5e133 (diff)
parentb611cc9207753299a05ac841d41375bc05c24910 (diff)
downloadtcl-70104e9f5f70cdf013c07fb923e56df215cf4ac3.zip
tcl-70104e9f5f70cdf013c07fb923e56df215cf4ac3.tar.gz
tcl-70104e9f5f70cdf013c07fb923e56df215cf4ac3.tar.bz2
Merge 9.0
-rw-r--r--generic/tclDate.c2
-rw-r--r--generic/tclGetDate.y2
-rw-r--r--unix/tclConfig.h.in7
3 files changed, 7 insertions, 4 deletions
diff --git a/generic/tclDate.c b/generic/tclDate.c
index 0dfdb81..2bd1ed5 100644
--- a/generic/tclDate.c
+++ b/generic/tclDate.c
@@ -97,7 +97,7 @@
#ifdef _MSC_VER
#pragma warning( disable : 4102 )
#elif defined (__clang__) && (__clang_major__ > 14)
-#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+#pragma clang diagnostic ignored "-Wunused-but-set-variable"
#elif (__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5)))
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif
diff --git a/generic/tclGetDate.y b/generic/tclGetDate.y
index 2b71af4..75c3e81 100644
--- a/generic/tclGetDate.y
+++ b/generic/tclGetDate.y
@@ -46,7 +46,7 @@
#ifdef _MSC_VER
#pragma warning( disable : 4102 )
#elif defined (__clang__) && (__clang_major__ > 14)
-#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+#pragma clang diagnostic ignored "-Wunused-but-set-variable"
#elif (__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5)))
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif
diff --git a/unix/tclConfig.h.in b/unix/tclConfig.h.in
index b07701f..a05a5c8 100644
--- a/unix/tclConfig.h.in
+++ b/unix/tclConfig.h.in
@@ -186,14 +186,17 @@
/* Define to 1 if you have the 'pthread_attr_setstacksize' function. */
#undef HAVE_PTHREAD_ATTR_SETSTACKSIZE
+/* Define to 1 if you have the 'pthread_spin_lock' function. */
+#undef HAVE_PTHREAD_SPIN_LOCK
+
/* Does putenv() copy strings or incorporate them by reference? */
#undef HAVE_PUTENV_THAT_COPIES
/* Are characters signed? */
#undef HAVE_SIGNED_CHAR
-/* Do we have <stdbool.h>? */
-#undef HAVE_STDBOOL_H
+/* Do we have <stdatomic.h>? */
+#undef HAVE_STDATOMIC_H
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H