Converted the krb5/krb directory to work under windows. Mostly added the

windows INTERFACE keyword to functions.

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

4 files changed, 34 insertions, 13 deletions

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 865c2b82f..92bb602de 100644
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,11 @@
+Mon Feb 27 11:35:49 1995 Keith Vetter (keithv@fusion.com)
+
+        * config.h: added windows interface keyword for varargs functions,
+           added defines to allows <windows.h> to be stdc compliant.
+	* func-proto.h: added windows INTERFACE_C keyword for functions
+           with varargs, and fixed const in prototype for krb5_send_tgs.
+        * preauth.h: added windows INTERFACE keyword to prototypes
+
 Wed Feb 22 17:39:46 1995 Chris Provenzano (proven@mit.edu)
 
 	* func-proto.h (krb5_get_credentials(), krb5_get_cred_from_kdc(),
diff --git a/src/include/krb5/config.h b/src/include/krb5/config.h
index 039433969..3f03ddae8 100644
--- a/src/include/krb5/config.h
+++ b/src/include/krb5/config.h
@@ -55,10 +55,21 @@ typedef unsigned char u_char;
 #endif 
 
 #ifndef INTERFACE
-#define INTERFACE __far __export __pascal
+#define INTERFACE   __far __export __pascal
+#define INTERFACE_C __far __export __cdecl
 #endif
 #define FAR __far
 
+/*
+ * The following defines are needed to make <windows.h> work
+ * in stdc mode (/Za flag). Winsock.h needs <windows.h>.
+ */
+#define _far    __far
+#define _near   __near
+#define _pascal __pascal
+#define _cdecl  __cdecl
+#define _huge   __huge
+
 #else 		/* Rest of include file is for non-Microloss-Windows */
 
 #ifndef KRB5_AUTOCONF__
@@ -116,7 +127,9 @@ typedef unsigned char u_char;
  * just define it as NULL.
  */
 #define INTERFACE
+#define INTERFACE_C
 #define FAR
+#define labs(x) abs(x)
 
 #endif /* __windows__ */
 
diff --git a/src/include/krb5/func-proto.h b/src/include/krb5/func-proto.h
index 92c7f2cec..038b458a3 100644
--- a/src/include/krb5/func-proto.h
+++ b/src/include/krb5/func-proto.h
@@ -235,13 +235,13 @@ krb5_error_code INTERFACE krb5_generate_seq_number
 krb5_error_code INTERFACE krb5_get_server_rcache
     	PROTOTYPE((krb5_context,
 		   const krb5_data *, krb5_rcache *));
-krb5_error_code krb5_build_principal_ext
+krb5_error_code INTERFACE_C krb5_build_principal_ext
     	STDARG_P((krb5_context, krb5_principal *, int, const char *, ...));
-krb5_error_code krb5_build_principal
+krb5_error_code INTERFACE_C krb5_build_principal
     	STDARG_P((krb5_context, krb5_principal *, int, const char *, ...));
 #ifdef va_start
 /* XXX depending on varargs include file defining va_start... */
-krb5_error_code krb5_build_principal_va
+krb5_error_code INTERFACE_C krb5_build_principal_va
     	PROTOTYPE((krb5_context,
 		   krb5_principal *, int, const char *, va_list));
 #endif
@@ -439,7 +439,7 @@ krb5_error_code INTERFACE krb5_send_tgs
 		   const krb5_cksumtype,
 		   krb5_const_principal,
 		   krb5_address * const *,
-		   krb5_authdata * const *,
+		   const krb5_authdata **,
 		   krb5_pa_data * const *,
 		   const krb5_data *,
 		   krb5_creds *,
@@ -451,13 +451,13 @@ krb5_error_code INTERFACE krb5_get_in_tkt
 		   krb5_address * const *,
 		   krb5_enctype *,
 		   krb5_preauthtype *,
-		   krb5_error_code (* )(krb5_context,
+		   krb5_error_code (INTERFACE * )(krb5_context,
 					const krb5_keytype,
                                         krb5_data *,
                                         krb5_const_pointer,
                                         krb5_keyblock **),
 		   krb5_const_pointer,
-		   krb5_error_code (* )(krb5_context,
+		   krb5_error_code (INTERFACE * )(krb5_context,
 					const krb5_keyblock *,
 					krb5_const_pointer,
 					krb5_kdc_rep * ),
diff --git a/src/include/krb5/preauth.h b/src/include/krb5/preauth.h
index a22e196b8..3a16ee5cc 100644
--- a/src/include/krb5/preauth.h
+++ b/src/include/krb5/preauth.h
@@ -35,11 +35,11 @@
 /*
  * Note: these typedefs are subject to change.... [tytso:19920903.1609EDT]
  */
-typedef krb5_error_code (krb5_preauth_obtain_proc)
+typedef krb5_error_code (INTERFACE krb5_preauth_obtain_proc)
     PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr,
 	       krb5_pa_data *pa_data));
 
-typedef krb5_error_code (krb5_preauth_verify_proc)
+typedef krb5_error_code (INTERFACE krb5_preauth_verify_proc)
     PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr,
 	       krb5_data *data));
 
@@ -67,19 +67,19 @@ krb5_error_code verify_random_padata
 	       krb5_data *data));
 #endif
 
-krb5_error_code get_unixtime_padata
+krb5_error_code INTERFACE get_unixtime_padata
     PROTOTYPE((krb5_context, krb5_principal client, 
 	       krb5_address **src_addr, krb5_pa_data *data));
 
-krb5_error_code verify_unixtime_padata
+krb5_error_code INTERFACE verify_unixtime_padata
     PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr,
 	       krb5_data *data));
 
-krb5_error_code get_securid_padata
+krb5_error_code INTERFACE get_securid_padata
     PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr,
 	       krb5_pa_data *data));
 
-krb5_error_code verify_securid_padata
+krb5_error_code INTERFACE verify_securid_padata
     PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr,
 	       krb5_data *data));