Make the format of LC_CTYPE files architecture independent by

introducing the disk formats for _RuneLocale and friends.

The disk formats do not have (useless) pointers and have 32-bit
quantities instead of rune_t and long.  (htonl(3) only works
with 32-bit quantities, so there's no loss).

Bootstrap mklocale(1) when necessary.  (Bootstrapping from 4.x
would be trivial (verified), but we no longer provide pre-5.3
source upgrades and this is the first commit to actually break
it.)

1 files changed, 7 insertions, 5 deletions

diff --git a/usr.bin/mklocale/ldef.h b/usr.bin/mklocale/ldef.h
index 2a253b8..f35506b 100644
--- a/usr.bin/mklocale/ldef.h
+++ b/usr.bin/mklocale/ldef.h
@@ -37,18 +37,20 @@
  *	$FreeBSD$
  */
 
+#include <sys/types.h>
+
 /*
  * This should look a LOT like a _RuneEntry
  */
 typedef struct rune_list {
-    rune_t		min;
-    rune_t 		max;
-    rune_t 		map;
-    unsigned long	*types;
+    int32_t		min;
+    int32_t 		max;
+    int32_t 		map;
+    uint32_t		*types;
     struct rune_list	*next;
 } rune_list;
 
 typedef struct rune_map {
-    unsigned long	map[_CACHED_RUNES];
+    uint32_t		map[_CACHED_RUNES];
     rune_list		*root;
 } rune_map;