summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Kohl <jtkohl@mit.edu>1990-09-11 14:42:33 +0000
committerJohn Kohl <jtkohl@mit.edu>1990-09-11 14:42:33 +0000
commit2973d0abb10f97541e0e319b043fa0678606b7dc (patch)
treedb14d74965481bd157db3caebd2d2671a3ac2b6c /src
parent8bde5ec620a140b1dff0665c22f15919adf34a2a (diff)
downloadkrb5-2973d0abb10f97541e0e319b043fa0678606b7dc.tar.gz
krb5-2973d0abb10f97541e0e319b043fa0678606b7dc.tar.xz
krb5-2973d0abb10f97541e0e319b043fa0678606b7dc.zip
fix more confusion with krb5_ui_* types
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@1116 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/include/krb5/base-defs.h6
-rw-r--r--src/include/krb5/wordsize.h7
2 files changed, 8 insertions, 5 deletions
diff --git a/src/include/krb5/base-defs.h b/src/include/krb5/base-defs.h
index baac2c48e..443a96557 100644
--- 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 c2399cc60..02b4924ba 100644
--- 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