talons

commit 4f9834be61da935505c0e4eccd34a05b1e2c5fc3
parent 688c2751dfe57da18dd612a2014522cf17976b73
Author: Oliver Lowe <o@olowe.co>
Date:   Tue,  2 Sep 2025 12:33:14 +1000

Assume wchar.h, wctype are available per C99

1999 is 26 years ago now

Diffstat:
M
configure.ac
 | 
3
+--
M
src/addr_compl.c
 | 
6
++----
M
src/common/utils.c
 | 
6
++----
M
src/common/utils.h
 | 
4
+---
M
src/compose.c
 | 
7
++-----
M
src/gtk/gtkutils.c
 | 
7
++-----
M
src/gtk/gtkutils.h
 | 
4
+---

7 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -173,8 +173,7 @@ fi
 dnl Checks for header files.
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(fcntl.h sys/file.h unistd.h paths.h \
-		 sys/param.h sys/select.h \
-		 wchar.h wctype.h locale.h netdb.h)
+		 sys/param.h sys/select.h locale.h netdb.h)
 AC_CHECK_HEADER([execinfo.h], [AC_DEFINE(HAVE_BACKTRACE,1,[Has backtrace*() needed for retrieving stack traces])])
 AC_SEARCH_LIBS(backtrace_symbols, [execinfo])
 
diff --git a/src/addr_compl.c b/src/addr_compl.c
@@ -30,10 +30,8 @@
 
 #include <string.h>
 #include <ctype.h>
-#if (HAVE_WCTYPE_H && HAVE_WCHAR_H)
-#  include <wchar.h>
-#  include <wctype.h>
-#endif
+#include <wchar.h>
+#include <wctype.h>
 
 #include "addr_compl.h"
 #include "addritem.h"
diff --git a/src/common/utils.c b/src/common/utils.c
@@ -47,10 +47,8 @@
 #include <sys/param.h>
 #include <sys/socket.h>
 
-#if (HAVE_WCTYPE_H && HAVE_WCHAR_H)
-#  include <wchar.h>
-#  include <wctype.h>
-#endif
+#include <wchar.h>
+#include <wctype.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <sys/stat.h>
diff --git a/src/common/utils.h b/src/common/utils.h
@@ -42,9 +42,7 @@
 #if HAVE_ALLOCA_H
 #  include <alloca.h>
 #endif
-#if HAVE_WCHAR_H
-#  include <wchar.h>
-#endif
+#include <wchar.h>
 
 /* The Hurd doesn't have these limits */
 #ifndef PATH_MAX
diff --git a/src/compose.c b/src/compose.c
@@ -47,15 +47,12 @@
 #if HAVE_SYS_WAIT_H
 #  include <sys/wait.h>
 #endif
+#include <wchar.h>
+#include <wctype.h>
 #include <signal.h>
 #include <errno.h>
 #include <libgen.h>
 
-#if (HAVE_WCTYPE_H && HAVE_WCHAR_H)
-#  include <wchar.h>
-#  include <wctype.h>
-#endif
-
 #include "claws.h"
 #include "main.h"
 #include "mainwindow.h"
diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
@@ -30,14 +30,11 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <sys/stat.h>
+#include <wchar.h>
+#include <wctype.h>
 
 #include "combobox.h"
 
-#if (HAVE_WCTYPE_H && HAVE_WCHAR_H)
-#  include <wchar.h>
-#  include <wctype.h>
-#endif
-
 #include "defs.h"
 #include "gtkutils.h"
 #include "utils.h"
diff --git a/src/gtk/gtkutils.h b/src/gtk/gtkutils.h
@@ -27,9 +27,7 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include <stdlib.h>
-#if HAVE_WCHAR_H
-#  include <wchar.h>
-#endif
+#include <wchar.h>
 
 #include "gtkcmctree.h"