remove confounder

sort types by base types
add wide prototype support

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

diff --git a/src/include/krb5/base-defs.h b/src/include/krb5/base-defs.h
index 7ee3211f608fa5fdbebfa7f7dc6b26ac2a0c7f10..1245706d1eb423363dc51238e4921d0659081829 100644 (file)
--- a/src/include/krb5/base-defs.h
+++ b/src/include/krb5/base-defs.h
@@ -26,11 +26,8 @@
 #endif
 
 typedef krb5_octet     krb5_boolean;
-typedef krb5_int32     krb5_timestamp;
-typedef krb5_ui_4      krb5_confounder;
 typedef        krb5_octet      krb5_msgtype;
 typedef        krb5_octet      krb5_kvno;
-typedef        krb5_int32      krb5_flags;
 
 typedef        krb5_ui_2       krb5_addrtype;
 typedef krb5_ui_2      krb5_keytype;
@@ -38,6 +35,8 @@ typedef krb5_ui_2     krb5_enctype;
 typedef krb5_ui_2      krb5_cksumtype;
 typedef krb5_ui_2      krb5_authdatatype;
 
+typedef        krb5_int32      krb5_flags;
+typedef krb5_int32     krb5_timestamp;
 typedef        krb5_int32      krb5_error_code;
 typedef krb5_int32     krb5_deltat;
 
@@ -51,9 +50,14 @@ typedef struct _krb5_data {
 typedef        void * krb5_pointer;
 typedef void const * krb5_const_pointer;
 #define PROTOTYPE(x) x
+#ifdef NARROW_PROTOTYPES
 #define DECLARG(type, val) type val
 #define OLDDECLARG(type, val)
 #else
+#define DECLARG(type, val) val
+#define OLDDECLARG(type, val) type val;
+#endif /* Narrow prototypes */
+#else
 /* make const & volatile available without effect */
 #define const
 #define volatile