Windows global stuff:

 o removed INTERFACE from non-api functions
 o add FAR to pointers visible to the world
 o made the tests for __STDC__ also check for _WINDOWS
 o creates GSSAPI.DLL & GSSAPI.LIB as per spec.

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

26 files changed, 36 insertions, 31 deletions

diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 75cb1dcb2..f647257c0 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com)
+
+	* *.[ch]: removed unneeded INTERFACE from non-api functions.
+        * read_pwd.c: __STDC__ conditional also checks the _WINDOWS define.
+
 Fri Apr 7 15:32:04 1995 Keith Vetter (keithv@fusion.com)
 
 	* ccdefname.c: 
diff --git a/src/lib/krb5/os/an_to_ln.c b/src/lib/krb5/os/an_to_ln.c
index 01e3d415c..cb11cfdd1 100644
--- a/src/lib/krb5/os/an_to_ln.c
+++ b/src/lib/krb5/os/an_to_ln.c
@@ -173,7 +173,7 @@ username_an_to_ln(context, aname, lnsize, lname)
 
 #ifdef _MSDOS
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_aname_to_localname(context, aname, lnsize, lname)
     krb5_context context;
 	krb5_const_principal aname;
diff --git a/src/lib/krb5/os/ccdefname.c b/src/lib/krb5/os/ccdefname.c
index dd20f171b..fa794ca6a 100644
--- a/src/lib/krb5/os/ccdefname.c
+++ b/src/lib/krb5/os/ccdefname.c
@@ -28,7 +28,7 @@
 #include "k5-int.h"
 #include <stdio.h>
 
-char * INTERFACE
+char *
 krb5_cc_default_name(context)
     krb5_context context;
 {
diff --git a/src/lib/krb5/os/free_hstrl.c b/src/lib/krb5/os/free_hstrl.c
index 8314d44f6..f112041e4 100644
--- a/src/lib/krb5/os/free_hstrl.c
+++ b/src/lib/krb5/os/free_hstrl.c
@@ -31,7 +31,7 @@
  Frees the storage taken by a realm list returned by krb5_get_local_realm.
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_free_host_realm(context, realmlist)
     krb5_context context;
     char * const *realmlist;
diff --git a/src/lib/krb5/os/free_krbhs.c b/src/lib/krb5/os/free_krbhs.c
index 8b50a74c7..066acfcbf 100644
--- a/src/lib/krb5/os/free_krbhs.c
+++ b/src/lib/krb5/os/free_krbhs.c
@@ -30,7 +30,7 @@
  Frees the storage taken by a host list returned by krb5_get_krbhst.
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_free_krbhst(context, hostlist)
     krb5_context context;
     char * const *hostlist;
diff --git a/src/lib/krb5/os/full_ipadr.c b/src/lib/krb5/os/full_ipadr.c
index 775106431..41e6f1c1b 100644
--- a/src/lib/krb5/os/full_ipadr.c
+++ b/src/lib/krb5/os/full_ipadr.c
@@ -31,7 +31,7 @@
 
 #include "os-proto.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_make_full_ipaddr(context, adr, port, outaddr)
     krb5_context context;
     krb5_int32 adr;
diff --git a/src/lib/krb5/os/gen_port.c b/src/lib/krb5/os/gen_port.c
index 3789759aa..a5eb91bca 100644
--- a/src/lib/krb5/os/gen_port.c
+++ b/src/lib/krb5/os/gen_port.c
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "os-proto.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_gen_portaddr(context, addr, ptr, outaddr)
     krb5_context context;
     const krb5_address *addr;
diff --git a/src/lib/krb5/os/gen_rname.c b/src/lib/krb5/os/gen_rname.c
index d4b933de1..50c17242c 100644
--- a/src/lib/krb5/os/gen_rname.c
+++ b/src/lib/krb5/os/gen_rname.c
@@ -29,7 +29,7 @@
 #include "k5-int.h"
 #include "os-proto.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_gen_replay_name(context, address, uniq, string)
     krb5_context context;
     const krb5_address *address;
diff --git a/src/lib/krb5/os/get_krbhst.c b/src/lib/krb5/os/get_krbhst.c
index d41b80a37..093af1163 100644
--- a/src/lib/krb5/os/get_krbhst.c
+++ b/src/lib/krb5/os/get_krbhst.c
@@ -57,7 +57,7 @@
 extern char *krb5_config_file;		/* extern so can be set at
 					   load/runtime */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_get_krbhst(context, realm, hostlist)
     krb5_context context;
     const krb5_data *realm;
diff --git a/src/lib/krb5/os/hst_realm.c b/src/lib/krb5/os/hst_realm.c
index 89156ee4b..950e2d04b 100644
--- a/src/lib/krb5/os/hst_realm.c
+++ b/src/lib/krb5/os/hst_realm.c
@@ -131,7 +131,7 @@ read_2str (FILE *fp, char *b1, int l1, char *b2, int l2) {
 
 #endif /* _WINDOWS */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_get_host_realm(context, host, realmsp)
     krb5_context context;
     const char *host;
diff --git a/src/lib/krb5/os/init_os_ctx.c b/src/lib/krb5/os/init_os_ctx.c
index 3f9599aad..4c92c6775 100644
--- a/src/lib/krb5/os/init_os_ctx.c
+++ b/src/lib/krb5/os/init_os_ctx.c
@@ -25,7 +25,7 @@
 
 #include "k5-int.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_os_init_context(ctx)
 	krb5_context ctx;
 {
@@ -45,7 +45,7 @@ krb5_os_init_context(ctx)
 	return 0;
 }
 
-void INTERFACE
+void
 krb5_os_free_context(ctx)
 	krb5_context	ctx;
 {
diff --git a/src/lib/krb5/os/krbfileio.c b/src/lib/krb5/os/krbfileio.c
index 43d12478b..5cc953801 100644
--- a/src/lib/krb5/os/krbfileio.c
+++ b/src/lib/krb5/os/krbfileio.c
@@ -51,7 +51,7 @@ static char *VersionID = "@(#)krbfileio.c	2 - 08/22/91";
 #   define OPEN_MODE_NOT_TRUSTWORTHY
 #endif
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_create_secure_file(context, pathname)
     krb5_context context;
     const char * pathname;
@@ -90,7 +90,7 @@ krb5_create_secure_file(context, pathname)
     }
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_sync_disk_file(context, fp)
     krb5_context context;
     FILE *fp;
diff --git a/src/lib/krb5/os/ktdefname.c b/src/lib/krb5/os/ktdefname.c
index 3e9e13d5f..d6321eb46 100644
--- a/src/lib/krb5/os/ktdefname.c
+++ b/src/lib/krb5/os/ktdefname.c
@@ -28,7 +28,7 @@
 
 extern char *krb5_defkeyname;
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_kt_default_name(context, name, namesize)
     krb5_context context;
     char *name;
diff --git a/src/lib/krb5/os/kuserok.c b/src/lib/krb5/os/kuserok.c
index 5a25e53a0..29573df15 100644
--- a/src/lib/krb5/os/kuserok.c
+++ b/src/lib/krb5/os/kuserok.c
@@ -143,7 +143,7 @@ krb5_kuserok(context, principal, luser)
  * If the given Kerberos name "server" translates to the same name as "luser"
  * (using * krb5_aname_to_lname()), returns TRUE.
  */
-krb5_boolean INTERFACE
+krb5_boolean
 krb5_kuserok(context, principal, luser)
     krb5_context context;
     krb5_principal principal;
diff --git a/src/lib/krb5/os/locate_kdc.c b/src/lib/krb5/os/locate_kdc.c
index 61abc2cef..cc498705c 100644
--- a/src/lib/krb5/os/locate_kdc.c
+++ b/src/lib/krb5/os/locate_kdc.c
@@ -37,7 +37,7 @@ extern char *krb5_kdc_sec_udp_portname;
  * returns count of number of addresses found
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_locate_kdc(context, realm, addr_pp, naddrs)
     krb5_context context;
     const krb5_data *realm;
diff --git a/src/lib/krb5/os/lock_file.c b/src/lib/krb5/os/lock_file.c
index a449da250..dfdd729ed 100644
--- a/src/lib/krb5/os/lock_file.c
+++ b/src/lib/krb5/os/lock_file.c
@@ -108,7 +108,7 @@ krb5_lock_file(context, filep, pathname, mode)
 }
 #else   /* MSDOS or Macintosh */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_lock_file(context, filep, pathname, mode)
     krb5_context context;
     FILE *filep;
diff --git a/src/lib/krb5/os/net_read.c b/src/lib/krb5/os/net_read.c
index 9b28896d9..8cd5d15ef 100644
--- a/src/lib/krb5/os/net_read.c
+++ b/src/lib/krb5/os/net_read.c
@@ -35,7 +35,7 @@
  * XXX must not use non-blocking I/O
  */
 
-int INTERFACE
+int
 krb5_net_read(context, fd, buf, len)
     krb5_context context;
     int fd;
diff --git a/src/lib/krb5/os/net_write.c b/src/lib/krb5/os/net_write.c
index 4885a8172..f623d99df 100644
--- a/src/lib/krb5/os/net_write.c
+++ b/src/lib/krb5/os/net_write.c
@@ -34,7 +34,7 @@
  * XXX must not use non-blocking I/O
  */
 
-int INTERFACE
+int
 krb5_net_write(context, fd, buf, len)
     krb5_context context;
     int fd;
diff --git a/src/lib/krb5/os/os-proto.h b/src/lib/krb5/os/os-proto.h
index e5f982673..f23bb6646 100644
--- a/src/lib/krb5/os/os-proto.h
+++ b/src/lib/krb5/os/os-proto.h
@@ -28,7 +28,7 @@
 #define KRB5_LIBOS_INT_PROTO__
 
 #ifdef SOCK_DGRAM			/* XXX hack... */
-krb5_error_code INTERFACE krb5_locate_kdc
+krb5_error_code krb5_locate_kdc
     PROTOTYPE((krb5_context,
 	       const krb5_data *,
 	       struct sockaddr **,
@@ -36,20 +36,20 @@ krb5_error_code INTERFACE krb5_locate_kdc
 #endif
 
 #ifdef KRB5_USE_INET
-krb5_error_code INTERFACE krb5_unpack_full_ipaddr
+krb5_error_code krb5_unpack_full_ipaddr
     PROTOTYPE((krb5_context,
 	       const krb5_address *,
 	       krb5_int32 *,
 	       krb5_int16 *));
 
 #ifdef NARROW_PROTOTYPES
-krb5_error_code INTERFACE krb5_make_full_ipaddr
+krb5_error_code krb5_make_full_ipaddr
     PROTOTYPE((krb5_context,
 	       krb5_int32,
 	       krb5_int16,
 	       krb5_address **));
 #else
-krb5_error_code INTERFACE krb5_make_full_ipaddr
+krb5_error_code krb5_make_full_ipaddr
     PROTOTYPE((krb5_context,
 	       krb5_int32,
 	       int,			/* unsigned short promotes to signed
diff --git a/src/lib/krb5/os/port2ip.c b/src/lib/krb5/os/port2ip.c
index 7491727a5..531e61a47 100644
--- a/src/lib/krb5/os/port2ip.c
+++ b/src/lib/krb5/os/port2ip.c
@@ -30,7 +30,7 @@
 #ifdef KRB5_USE_INET
 #include "os-proto.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_unpack_full_ipaddr(context, inaddr, adr, port)
     krb5_context context;
     const krb5_address *inaddr;
diff --git a/src/lib/krb5/os/read_msg.c b/src/lib/krb5/os/read_msg.c
index bd9cb6ea6..a5dc7964c 100644
--- a/src/lib/krb5/os/read_msg.c
+++ b/src/lib/krb5/os/read_msg.c
@@ -28,7 +28,7 @@
 #include "k5-int.h"
 #include <errno.h>
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_read_message(context, fdp, inbuf)
     krb5_context context;
 	krb5_pointer fdp;
diff --git a/src/lib/krb5/os/read_pwd.c b/src/lib/krb5/os/read_pwd.c
index 0c05359d3..0944e47fe 100644
--- a/src/lib/krb5/os/read_pwd.c
+++ b/src/lib/krb5/os/read_pwd.c
@@ -81,7 +81,7 @@ krb5_read_password(context, prompt, prompt2, return_pwd, size_return)
     int *size_return;
 {
     /* adapted from Kerberos v4 des/read_password.c */
-#if defined(__STDC__) || defined(mips)
+#if defined(__STDC__) || defined(mips) || defined(_WINDOWS)
     /* readin_string is used after a longjmp, so must be volatile */
     volatile
 #endif
@@ -254,7 +254,7 @@ krb5_read_password(context, prompt, prompt2, return_pwd, size_return)
 /* Don't expect to be called, just define it for sanity and the linker.
 */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_read_password(context, prompt, prompt2, return_pwd, size_return)
     krb5_context context;
     char *prompt;
diff --git a/src/lib/krb5/os/realm_dom.c b/src/lib/krb5/os/realm_dom.c
index 5b4c071a9..fcb0b5594 100644
--- a/src/lib/krb5/os/realm_dom.c
+++ b/src/lib/krb5/os/realm_dom.c
@@ -101,7 +101,7 @@ read_2str (FILE *fp, char *b1, int l1, char *b2, int l2) {
 
 #endif /* _WINDOWS */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_get_realm_domain(context, realm, domain)
     krb5_context context;
     const char *realm;
diff --git a/src/lib/krb5/os/sendto_kdc.c b/src/lib/krb5/os/sendto_kdc.c
index f4fffee9b..c64320c41 100644
--- a/src/lib/krb5/os/sendto_kdc.c
+++ b/src/lib/krb5/os/sendto_kdc.c
@@ -56,7 +56,7 @@ extern int krb5_max_skdc_timeout;
 extern int krb5_skdc_timeout_shift;
 extern int krb5_skdc_timeout_1;
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_sendto_kdc (context, message, realm, reply)
     krb5_context context;
     const krb5_data * message;
diff --git a/src/lib/krb5/os/unlck_file.c b/src/lib/krb5/os/unlck_file.c
index 3e0b3b32b..900073e09 100644
--- a/src/lib/krb5/os/unlck_file.c
+++ b/src/lib/krb5/os/unlck_file.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include "k5-int.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_unlock_file(context, filep, pathname)
     krb5_context context;
     FILE *filep;
diff --git a/src/lib/krb5/os/write_msg.c b/src/lib/krb5/os/write_msg.c
index 85845c1da..ec1ff01c4 100644
--- a/src/lib/krb5/os/write_msg.c
+++ b/src/lib/krb5/os/write_msg.c
@@ -28,7 +28,7 @@
 #include "k5-int.h"
 #include <errno.h>
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_write_message(context, fdp, outbuf)
     krb5_context context;
 	krb5_pointer	fdp;