make prototypes unconditional

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

diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index 72d9080468c49d81f0a81b3fd24736e04457ddf8..0bb8e6d140df9b49c159e5377e1780979b423761 100644 (file)
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-10  Ken Raeburn  <raeburn@mit.edu>
+
+       * conv_creds.c, encode.c, krb524.h, test.c: Always use prototypes,
+       don't use macros PROTOTYPE and KRB5_PROTOTYPE.
+
 2001-03-12  Ezra Peisach  <epeisach@mit.edu>
 
        * krb524d.c: Provide prototypes for local functions.

diff --git a/src/krb524/conv_creds.c b/src/krb524/conv_creds.c
index 2d031ea57c2cc4ab855770b1ebb6464d6553168c..89a8d54d5d93636d6198f8497e06dcd95d4bbe45 100644 (file)
--- a/src/krb524/conv_creds.c
+++ b/src/krb524/conv_creds.c
@@ -34,12 +34,12 @@
 #include "krb524.h"
 
 krb5_error_code krb524_convert_creds_plain
-KRB5_PROTOTYPE((krb5_context context, krb5_creds *v5creds, 
-                  CREDENTIALS *v4creds));
+(krb5_context context, krb5_creds *v5creds, 
+                  CREDENTIALS *v4creds);
 
 krb5_error_code krb524_sendto_kdc
-KRB5_PROTOTYPE((krb5_context context, const krb5_data *message,
-               krb5_data *realm, krb5_data *reply));
+(krb5_context context, const krb5_data *message,
+               krb5_data *realm, krb5_data *reply);
 
 krb5_error_code
 krb524_convert_creds_kdc(context, v5creds, v4creds)

diff --git a/src/krb524/encode.c b/src/krb524/encode.c
index 60a821410f6da1527587791c0b9c3bbbc2f6f1eb..46fc845025ea35cd36580b5e1f0d31857dfaa90d 100644 (file)
--- a/src/krb524/encode.c
+++ b/src/krb524/encode.c
@@ -41,15 +41,15 @@
  * the wheel is hidden.
  */
 
-int  encode_v4tkt KRB5_PROTOTYPE((KTEXT_ST *, char *, unsigned int *)),
-     encode_ktext KRB5_PROTOTYPE((char **, int *, KTEXT_ST *)),
-     encode_bytes KRB5_PROTOTYPE((char **, int *, char *, int)),
-     encode_int32 KRB5_PROTOTYPE((char **, int *, krb5_int32 *));
-
-int  decode_v4tkt KRB5_PROTOTYPE((KTEXT_ST *, char *, unsigned int *)),
-     decode_ktext KRB5_PROTOTYPE((char **, int *, KTEXT_ST *)),
-     decode_bytes KRB5_PROTOTYPE((char **, int *, char *, int)),
-     decode_int32 KRB5_PROTOTYPE((char **, int *, krb5_int32 *));
+int  encode_v4tkt (KTEXT_ST *, char *, unsigned int *),
+     encode_ktext (char **, int *, KTEXT_ST *),
+     encode_bytes (char **, int *, char *, int),
+     encode_int32 (char **, int *, krb5_int32 *);
+
+int  decode_v4tkt (KTEXT_ST *, char *, unsigned int *),
+     decode_ktext (char **, int *, KTEXT_ST *),
+     decode_bytes (char **, int *, char *, int),
+     decode_int32 (char **, int *, krb5_int32 *);
 
 int encode_bytes(out, outlen, in, len)
      char **out;

diff --git a/src/krb524/krb524.h b/src/krb524/krb524.h
index f5f3d528ce216d5ecd67a75824401769b9b7c86e..8105f37ac9b52735d228b491294f1420f182842f 100644 (file)
--- a/src/krb524/krb524.h
+++ b/src/krb524/krb524.h
@@ -31,51 +31,51 @@
 extern int krb524_debug;
 
 int krb524_convert_tkt_skey
-       KRB5_PROTOTYPE((krb5_context context, krb5_ticket *v5tkt, KTEXT_ST *v4tkt, 
+       (krb5_context context, krb5_ticket *v5tkt, KTEXT_ST *v4tkt, 
                   krb5_keyblock *v5_skey, krb5_keyblock *v4_skey,
-                       struct sockaddr_in *saddr));
+                       struct sockaddr_in *saddr);
 
 /* conv_princ.c */
 
 int krb524_convert_princs
-       KRB5_PROTOTYPE((krb5_context context, krb5_principal client, 
+       (krb5_context context, krb5_principal client, 
                   krb5_principal server, char *pname, 
-                  char *pinst, char *prealm, char *sname, char *sinst));
+                  char *pinst, char *prealm, char *sname, char *sinst);
 
 /* conv_creds.c */
 
 int krb524_convert_creds_addr
-       KRB5_PROTOTYPE((krb5_context context, krb5_creds *v5creds, 
-                  CREDENTIALS *v4creds, struct sockaddr *saddr));
+       (krb5_context context, krb5_creds *v5creds, 
+                  CREDENTIALS *v4creds, struct sockaddr *saddr);
 
 int krb524_convert_creds_kdc
-       KRB5_PROTOTYPE((krb5_context context, krb5_creds *v5creds, 
-                  CREDENTIALS *v4creds));
+       (krb5_context context, krb5_creds *v5creds, 
+                  CREDENTIALS *v4creds);
 
 /* conv_tkt.c */
 
 int krb524_convert_tkt
-       KRB5_PROTOTYPE((krb5_principal server, krb5_data *v5tkt, KTEXT_ST *v4tkt,
-                  int *kvno, struct sockaddr_in *saddr));
+       (krb5_principal server, krb5_data *v5tkt, KTEXT_ST *v4tkt,
+                  int *kvno, struct sockaddr_in *saddr);
 
 /* encode.c */
 
 int encode_v4tkt
-       KRB5_PROTOTYPE((KTEXT_ST *v4tkt, char *buf, unsigned int *encoded_len));
+       (KTEXT_ST *v4tkt, char *buf, unsigned int *encoded_len);
 
 int decode_v4tkt
-       KRB5_PROTOTYPE((KTEXT_ST *v4tkt, char *buf, unsigned int *encoded_len));
+       (KTEXT_ST *v4tkt, char *buf, unsigned int *encoded_len);
 
 
 /* misc.c */
 
 void krb524_init_ets
-       KRB5_PROTOTYPE((krb5_context context));
+       (krb5_context context);
 
 /* sendmsg.c */
 
 int krb524_send_message 
-       KRB5_PROTOTYPE((const struct sockaddr * addr, const krb5_data * message,
-                  krb5_data * reply));
+       (const struct sockaddr * addr, const krb5_data * message,
+                  krb5_data * reply);
 
 #endif /* __KRB524_H__ */

diff --git a/src/krb524/test.c b/src/krb524/test.c
index 36832c2421a83d18f6a045d7aeae11638a842925..d4c5024a65b84d17ca9ed80e3d1967ab459e4c14 100644 (file)
--- a/src/krb524/test.c
+++ b/src/krb524/test.c
@@ -40,8 +40,8 @@
 
 #define krb5_print_addrs
 
-void do_local PROTOTYPE((krb5_creds *, krb5_keyblock *)),
-     do_remote PROTOTYPE((krb5_context, krb5_creds *, char *, krb5_keyblock *));
+void do_local (krb5_creds *, krb5_keyblock *),
+     do_remote (krb5_context, krb5_creds *, char *, krb5_keyblock *);
 
 static 
 void print_key(msg, key)