Use C99 standard fixed width types from stdint.h

diff --git a/contrib/misc/make-casetable.pl b/contrib/misc/make-casetable.pl
index 68bcfc9baa8c983e176fda8d7702709e2f47a94a..9af15a9d5068ce89402533d64a2682e530f78e12 100755 (executable)
--- a/contrib/misc/make-casetable.pl
+++ b/contrib/misc/make-casetable.pl
@@ -104,7 +104,7 @@ printf (CSOURCE "%s is got from\n", $ARGV[0]);
 printf (CSOURCE "http\:\/\/www.unicode.org\/Public\/UNIDATA\/UnicodeData.txt\n");
 printf (CSOURCE "\*\/\n");
 printf (CSOURCE "\n");
-printf (CSOURCE "\#include \<netatalk\/endian.h\>\n");
+printf (CSOURCE "\#include \<stdint.h\>\n");
 printf (CSOURCE "\#include \<atalk\/unicode.h\>\n");
 printf (CSOURCE "\#include \"%s\"\n", $ARGV[1]);
 printf (CSOURCE "\n");
@@ -231,7 +231,7 @@ sub make_array{
             $char_start = ($block_start -1)* 64;
             $char_end = ($block_end * 64) -1;
 
-            printf(CHEADER "static const u\_int16\_t %s\_table\_%d\[%d\] \= \{\n",
+            printf(CHEADER "static const uint16\_t %s\_table\_%d\[%d\] \= \{\n",
                    $_[0], $table_no, $char_end - $char_start +1);
 
             for ($char = $char_start ; $char <= $char_end ; $char++) {
@@ -270,7 +270,7 @@ sub make_array{
     printf(CSOURCE "\/*******************************************************************\n");
     printf(CSOURCE " Convert a surrogate pair to %s case.\n", $_[0]);
     printf(CSOURCE "*******************************************************************\/\n");
-    printf(CSOURCE "u\_int32\_t to%s\_sp\(u\_int32\_t val\)\n", $_[0]);
+    printf(CSOURCE "uint32\_t to%s\_sp\(uint32\_t val\)\n", $_[0]);
     printf(CSOURCE "{\n");
 
     $table_no = 1;
@@ -291,7 +291,7 @@ sub make_array{
             $char_start = ($block_start -1)* 64;
             $char_end = ($block_end * 64) -1;
 
-            printf(CHEADER "static const u\_int32\_t %s\_table\_sp\_%d\[%d\] \= \{\n",
+            printf(CHEADER "static const uint32\_t %s\_table\_sp\_%d\[%d\] \= \{\n",
                    $_[0], $table_no, $char_end - $char_start +1);
 
             for ($char = $char_start ; $char <= $char_end ; $char++) {

diff --git a/libatalk/unicode/utf16_case.c b/libatalk/unicode/utf16_case.c
index 5b23ee32c970e9b7b9ec904ee917f0a727d702e0..dab888c280ca19fea8924700fab1b2cbddbd288b 100644 (file)
--- a/libatalk/unicode/utf16_case.c
+++ b/libatalk/unicode/utf16_case.c
@@ -8,7 +8,7 @@ UnicodeData.txt is got from
 http://www.unicode.org/Public/UNIDATA/UnicodeData.txt
 */
 
-#include <netatalk/endian.h>
+#include <stdint.h>
 #include <atalk/unicode.h>
 #include "utf16_casetable.h"
 
@@ -53,7 +53,7 @@ ucs2_t toupper_w(ucs2_t val)
 /*******************************************************************
  Convert a surrogate pair to upper case.
 *******************************************************************/
-u_int32_t toupper_sp(u_int32_t val)
+uint32_t toupper_sp(uint32_t val)
 {
     if ( val >= 0xD801DC00 && val <= 0xD801DC7F)
         return upper_table_sp_1[val-0xD801DC00];
@@ -105,7 +105,7 @@ ucs2_t tolower_w(ucs2_t val)
 /*******************************************************************
  Convert a surrogate pair to lower case.
 *******************************************************************/
-u_int32_t tolower_sp(u_int32_t val)
+uint32_t tolower_sp(uint32_t val)
 {
     if ( val >= 0xD801DC00 && val <= 0xD801DC3F)
         return lower_table_sp_1[val-0xD801DC00];