More 64-bit hacking...

This code should be rewritten to avoid fixed sized types.

diff --git a/libraries/liblunicode/ucdata/ucdata.c b/libraries/liblunicode/ucdata/ucdata.c
index 77e32a3a3cceaf62771029e24b15de22cbc923bf..151e0ac1057f3c260aff7b1f42eac2a51a84bc25 100644 (file)
--- a/libraries/liblunicode/ucdata/ucdata.c
+++ b/libraries/liblunicode/ucdata/ucdata.c
@@ -45,8 +45,8 @@
  **************************************************************************/
 
 typedef struct {
-    ac_uint4 bom;
-    ac_uint4 cnt;
+    ac_uint2 bom;
+    ac_uint2 cnt;
     union {
         ac_uint4 bytes;
         ac_uint2 len[2]; 

diff --git a/libraries/liblunicode/ucdata/ucgendat.c b/libraries/liblunicode/ucdata/ucgendat.c
index e403638ddf3ff8ce9954b953d13f35562d8eaeeb..dcb4a91a39604391540acfef2b04ca722dbc1722 100644 (file)
--- a/libraries/liblunicode/ucdata/ucgendat.c
+++ b/libraries/liblunicode/ucdata/ucgendat.c
@@ -30,6 +30,7 @@
 #include "ldap_config.h"
 
 #include <stdio.h>
+#include <ac/bytes.h>
 #include <ac/stdlib.h>
 #include <ac/string.h>
 #include <ac/unistd.h>
@@ -1216,7 +1217,8 @@ static void
 write_cdata(char *opath)
 {
     FILE *out;
-    unsigned long i, idx, bytes, nprops;
+       ac_uint4 bytes;
+    unsigned long i, idx, nprops;
     unsigned short casecnt[2];
     char path[BUFSIZ];
 
@@ -1268,7 +1270,7 @@ write_cdata(char *opath)
     /*
      * Write the header.
      */
-    fwrite((char *) hdr, sizeof(unsigned short), 2, out);
+    fwrite((char *) hdr, sizeof(ac_uint4), 2, out);
 
     /*
      * Write the byte count.