fix more confusion with krb5_ui_* types

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@1116 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/krb5/base-defs.h b/src/include/krb5/base-defs.h
index baac2c48e52406b4bb4e02eb9982f4c565efabc7..443a96557032e6046abdf4ab4829695940b26f05 100644 (file)
--- a/src/include/krb5/base-defs.h
+++ b/src/include/krb5/base-defs.h
@@ -18,11 +18,6 @@
 
 #include <krb5/wordsize.h>
 
-typedef unsigned krb5_octet    krb5_ui_1;
-typedef unsigned krb5_int16    krb5_ui_2;
-typedef unsigned krb5_int32    krb5_ui_4;
-typedef unsigned krb5_octet    krb5_boolean;
-
 #ifndef FALSE
 #define        FALSE   0
 #endif
@@ -30,6 +25,7 @@ typedef unsigned krb5_octet   krb5_boolean;
 #define        TRUE    1
 #endif
 
+typedef krb5_octet     krb5_boolean;
 typedef krb5_int32     krb5_timestamp;
 typedef krb5_ui_4      krb5_confounder;
 typedef        krb5_octet      krb5_msgtype;

diff --git a/src/include/krb5/wordsize.h b/src/include/krb5/wordsize.h
index c2399cc60ab1b5be425f3bff5fc968fef3fc558d..02b4924ba0fe61d109cdee142b5bd4f2e2a05336 100644 (file)
--- a/src/include/krb5/wordsize.h
+++ b/src/include/krb5/wordsize.h
@@ -20,7 +20,11 @@
 #define __OK
 typedef        int     krb5_int16;
 typedef        long    krb5_int32;
+
 typedef        unsigned char   krb5_octet;
+typedef        unsigned char   krb5_ui_1;
+typedef        unsigned int    krb5_ui_2;
+typedef        unsigned long   krb5_ui_4;
 #endif
 
 #ifdef BITS32
@@ -28,6 +32,9 @@ typedef       unsigned char   krb5_octet;
 typedef        short   krb5_int16;
 typedef        int     krb5_int32;
 typedef        unsigned char   krb5_octet;
+typedef        unsigned char   krb5_ui_1;
+typedef        unsigned short  krb5_ui_2;
+typedef        unsigned int    krb5_ui_4;
 #endif
 
 #ifndef __OK