Adjust locale/rune*.h files so <stdio.h> and <wchar.h> get pulled

into fewer files that don't need them.

ok deraadt@

diff --git a/lib/libc/locale/___runetype_mb.c b/lib/libc/locale/___runetype_mb.c
index 68a2577..b422b50 100644 (file)
--- a/lib/libc/locale/___runetype_mb.c
+++ b/lib/libc/locale/___runetype_mb.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ___runetype_mb.c,v 1.3 2017/09/05 03:16:13 schwarze Exp $ */
+/*     $OpenBSD: ___runetype_mb.c,v 1.4 2024/08/18 02:22:29 guenther Exp $ */
 /*     $NetBSD: ___runetype_mb.c,v 1.10 2005/02/10 19:19:57 tnozaki Exp $      */
 
 /*-
@@ -34,7 +34,7 @@
  */
 
 #include <wctype.h>
-#include "rune.h"
+#include "runetype.h"
 #include "rune_local.h"
 
 _RuneType

diff --git a/lib/libc/locale/_wctrans.c b/lib/libc/locale/_wctrans.c
index 4394587..d0b26a3 100644 (file)
--- a/lib/libc/locale/_wctrans.c
+++ b/lib/libc/locale/_wctrans.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: _wctrans.c,v 1.2 2012/12/05 23:20:00 deraadt Exp $ */
+/*     $OpenBSD: _wctrans.c,v 1.3 2024/08/18 02:22:29 guenther Exp $ */
 /*     $NetBSD: _wctrans.c,v 1.6 2005/02/10 19:19:57 tnozaki Exp $     */
 
 /*-
@@ -62,8 +62,7 @@
 #include <wctype.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rune.h"
-#include "rune_local.h"
+#include "runetype.h"
 #include "_wctrans_local.h"
 
 /*

diff --git a/lib/libc/locale/rune.c b/lib/libc/locale/rune.c
index 12614a6..474576e 100644 (file)
--- a/lib/libc/locale/rune.c
+++ b/lib/libc/locale/rune.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rune.c,v 1.10 2022/07/27 20:00:11 guenther Exp $ */
+/*     $OpenBSD: rune.c,v 1.11 2024/08/18 02:22:29 guenther Exp $ */
 /*     $NetBSD: rune.c,v 1.26 2004/05/09 11:26:33 kleink Exp $ */
 
 /*-
@@ -63,12 +63,13 @@
 #include <sys/stat.h>
 #include <assert.h>
 #include <errno.h>
+#include <locale.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include "rune.h"
+#include "runetype.h"
 #include "rune_local.h"
 
 #define SAFE_ADD(x, y)                 \

diff --git a/lib/libc/locale/rune.h b/lib/libc/locale/rune.h
index 18b0775..daf6d39 100644 (file)
--- a/lib/libc/locale/rune.h
+++ b/lib/libc/locale/rune.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rune.h,v 1.5 2024/02/04 12:46:01 jca Exp $ */
+/*     $OpenBSD: rune.h,v 1.6 2024/08/18 02:22:29 guenther Exp $ */
 /*     $NetBSD: rune.h,v 1.9 2003/08/07 16:43:04 agc Exp $     */
 
 /*-
@@ -39,8 +39,6 @@
 #define        _RUNE_H_
 
 #include <locale.h>
-#include <stdio.h>
-#include <wchar.h>
 #include "runetype.h"
 
 #define        _LOCALE_NONE    (locale_t)0

diff --git a/lib/libc/locale/rune_local.h b/lib/libc/locale/rune_local.h
index 337e889..6c373b4 100644 (file)
--- a/lib/libc/locale/rune_local.h
+++ b/lib/libc/locale/rune_local.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rune_local.h,v 1.8 2022/07/27 20:00:11 guenther Exp $ */
+/*     $OpenBSD: rune_local.h,v 1.9 2024/08/18 02:22:29 guenther Exp $ */
 /*     $NetBSD: rune_local.h,v 1.7 2003/03/02 22:18:15 tshiozak Exp $  */
 
 /*-
@@ -30,6 +30,9 @@
 #ifndef _RUNE_LOCAL_H_
 #define _RUNE_LOCAL_H_
 
+#include <stdio.h>
+#include <wchar.h>
+
 __BEGIN_HIDDEN_DECLS
 
 /* rune.c */

diff --git a/lib/libc/locale/runetable.c b/lib/libc/locale/runetable.c
index 0990fe5..d16a11f 100644 (file)
--- a/lib/libc/locale/runetable.c
+++ b/lib/libc/locale/runetable.c
@@ -40,7 +40,6 @@
 #include <assert.h>
 #include <wchar.h>
 #include "rune.h"
-#include "rune_local.h"
 #include "citrus_ctype.h"
 
 _RuneLocale _DefaultRuneLocale = {

diff --git a/lib/libc/locale/wctype.c b/lib/libc/locale/wctype.c
index 5e2fe78..1213523 100644 (file)
--- a/lib/libc/locale/wctype.c
+++ b/lib/libc/locale/wctype.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: wctype.c,v 1.2 2024/02/04 12:46:01 jca Exp $ */
+/*     $OpenBSD: wctype.c,v 1.3 2024/08/18 02:22:29 guenther Exp $ */
 /*     $NetBSD: iswctype.c,v 1.15 2005/02/09 21:35:46 kleink Exp $     */
 
 /*
@@ -38,7 +38,6 @@
 #include <wchar.h>
 #include <wctype.h>
 #include <string.h>
-#include "rune.h"
 #include "runetype.h"
 
 static struct _WCTypeEntry wctype_entries[_WCTYPE_NINDEXES] =