* princ_comp.c (krb5_realm_compare), auth_con.c

	(krb5_auth_con_setports, krb5_auth_con_getaddrs,
	krb5_auth_con_initivector), addr_order.c (krb5_address_order),
	addr_comp.c (krb5_address_compare): Make KRB5_CALLCONV.
	[pullup from 1-2-2-branch]

	* bld_princ.c (krb5_build_principal_va): Make
	krb5_build_principal_va() KRB5_CALLCONV.
	[pullup from 1-2-2-branch]

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

6 files changed, 21 insertions, 6 deletions

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index e731460b4..01ae0342c 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,17 @@
+2002-06-18  Danilo Almeida  <dalmeida@mit.edu>
+
+	* princ_comp.c (krb5_realm_compare), auth_con.c
+	(krb5_auth_con_setports, krb5_auth_con_getaddrs,
+	krb5_auth_con_initivector), addr_order.c (krb5_address_order),
+	addr_comp.c (krb5_address_compare): Make KRB5_CALLCONV.
+	[pullup from 1-2-2-branch]
+
+2002-06-18  Danilo Almeida  <dalmeida@mit.edu>
+
+	* bld_princ.c (krb5_build_principal_va): Make
+	krb5_build_principal_va() KRB5_CALLCONV.
+	[pullup from 1-2-2-branch]
+
 2002-06-12  Ken Raeburn  <raeburn@mit.edu>
 
 	* preauth.c: Don't include syslog.h.
diff --git a/src/lib/krb5/krb/addr_comp.c b/src/lib/krb5/krb/addr_comp.c
index 359e570fd..22a99e217 100644
--- a/src/lib/krb5/krb/addr_comp.c
+++ b/src/lib/krb5/krb/addr_comp.c
@@ -32,7 +32,7 @@
 /*
  * If the two addresses are the same, return TRUE, else return FALSE
  */
-krb5_boolean
+krb5_boolean KRB5_CALLCONV
 krb5_address_compare(context, addr1, addr2)
     krb5_context context;
     const krb5_address *addr1;
diff --git a/src/lib/krb5/krb/addr_order.c b/src/lib/krb5/krb/addr_order.c
index 3145f297b..07618dd0d 100644
--- a/src/lib/krb5/krb/addr_order.c
+++ b/src/lib/krb5/krb/addr_order.c
@@ -37,7 +37,7 @@
  * Return an ordering on two addresses:  0 if the same,
  * < 0 if first is less than 2nd, > 0 if first is greater than 2nd.
  */
-int
+int KRB5_CALLCONV
 krb5_address_order(context, addr1, addr2)
     krb5_context context;
     const krb5_address *addr1;
diff --git a/src/lib/krb5/krb/auth_con.c b/src/lib/krb5/krb/auth_con.c
index ac41ef3dc..a27b552a5 100644
--- a/src/lib/krb5/krb/auth_con.c
+++ b/src/lib/krb5/krb/auth_con.c
@@ -109,7 +109,7 @@ krb5_auth_con_setaddrs(context, auth_context, local_addr, remote_addr)
     return retval;
 }
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV
 krb5_auth_con_getaddrs(context, auth_context, local_addr, remote_addr)
     krb5_context      	  context;
     krb5_auth_context 	  auth_context;
@@ -132,7 +132,7 @@ krb5_auth_con_getaddrs(context, auth_context, local_addr, remote_addr)
     return retval;
 }
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV
 krb5_auth_con_setports(context, auth_context, local_port, remote_port)
     krb5_context      	  context;
     krb5_auth_context     auth_context;
@@ -270,7 +270,7 @@ krb5_auth_con_getremoteseqnumber(context, auth_context, seqnumber)
     return 0;
 }
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV
 krb5_auth_con_initivector(context, auth_context)
     krb5_context      	  context;
     krb5_auth_context 	  auth_context;
diff --git a/src/lib/krb5/krb/bld_princ.c b/src/lib/krb5/krb/bld_princ.c
index c5374f37b..516f15fdc 100644
--- a/src/lib/krb5/krb/bld_princ.c
+++ b/src/lib/krb5/krb/bld_princ.c
@@ -33,6 +33,7 @@
 #include <stdarg.h>
 
 krb5_error_code
+KRB5_CALLCONV
 krb5_build_principal_va(context, princ, rlen, realm, ap)
     krb5_context context;
     krb5_principal princ;
diff --git a/src/lib/krb5/krb/princ_comp.c b/src/lib/krb5/krb/princ_comp.c
index 15e5d9bff..a270c8756 100644
--- a/src/lib/krb5/krb/princ_comp.c
+++ b/src/lib/krb5/krb/princ_comp.c
@@ -30,7 +30,7 @@
 
 #include "k5-int.h"
 
-krb5_boolean
+krb5_boolean KRB5_CALLCONV
 krb5_realm_compare(context, princ1, princ2)
     krb5_context context;
     krb5_const_principal princ1;