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

15 files changed, 176 insertions, 170 deletions

diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 5e3c5a3f38..e28a507675 100644
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,9 @@
+Thu Apr 13 16:27:56 1995 Keith Vetter (keithv@fusion.com)
+
+	* gssapi_e.c: __STDC__ conditional also checks the _WINDOWS define.
+	* *.[ch]: removed unneeded INTERFACE from non-api functions.
+        * *.h added FAR to pointers visible at to the world.
+
 Tue Mar 28 18:28:03 1995  John Gilmore  (gnu at toad.com)
 
 	* Makefile.in (unixmac):  Add to build header files.
diff --git a/src/lib/gssapi/generic/disp_com_err_status.c b/src/lib/gssapi/generic/disp_com_err_status.c
index 369c962f5b..79b5fbbe2e 100644
--- a/src/lib/gssapi/generic/disp_com_err_status.c
+++ b/src/lib/gssapi/generic/disp_com_err_status.c
@@ -40,7 +40,7 @@ static const char * const no_error = "No error";
    if status_type == GSS_C_MECH_CODE, return the output from error_message()
    */
 
-OM_uint32 INTERFACE
+OM_uint32
 g_display_com_err_status(minor_status, status_value, status_string)
      OM_uint32 *minor_status;
      OM_uint32 status_value;
diff --git a/src/lib/gssapi/generic/disp_major_status.c b/src/lib/gssapi/generic/disp_major_status.c
index 7dadd3e10f..c6f82789dc 100644
--- a/src/lib/gssapi/generic/disp_major_status.c
+++ b/src/lib/gssapi/generic/disp_major_status.c
@@ -202,7 +202,7 @@ static OM_uint32 display_bit(minor_status, code, status_string)
      message_context > 2  : print supplementary info bit (message_context-2)
      */
 
-OM_uint32 INTERFACE g_display_major_status(minor_status, status_value, 
+OM_uint32 g_display_major_status(minor_status, status_value, 
 				 message_context, status_string)
      OM_uint32 *minor_status;
      OM_uint32 status_value;
diff --git a/src/lib/gssapi/generic/gssapi.h b/src/lib/gssapi/generic/gssapi.h
index b8bf1fa1a1..61d01de0d7 100644
--- a/src/lib/gssapi/generic/gssapi.h
+++ b/src/lib/gssapi/generic/gssapi.h
@@ -37,9 +37,9 @@
  * First, define the platform-dependent types.
  */
 typedef krb5_ui_4 OM_uint32;
-typedef void * gss_name_t;
-typedef void * gss_cred_id_t;
-typedef void * gss_ctx_id_t;
+typedef void FAR * gss_name_t;
+typedef void FAR * gss_cred_id_t;
+typedef void FAR * gss_ctx_id_t;
 
 /*
  * Note that a platform supporting the xom.h X/Open header file
@@ -49,20 +49,20 @@ typedef void * gss_ctx_id_t;
 
 typedef struct gss_OID_desc_struct {
       OM_uint32 length;
-      void      *elements;
-} gss_OID_desc, *gss_OID;
+      void      FAR *elements;
+} gss_OID_desc, FAR *gss_OID;
 
-typedef const gss_OID_desc * const const_gss_OID;
+typedef const gss_OID_desc FAR * const const_gss_OID;
 
 typedef struct gss_OID_set_desc_struct  {
       int     count;
       gss_OID elements;
-} gss_OID_set_desc, *gss_OID_set;
+} gss_OID_set_desc, FAR *gss_OID_set;
 
 typedef struct gss_buffer_desc_struct {
       size_t length;
-      void *value;
-} gss_buffer_desc, *gss_buffer_t;
+      void FAR *value;
+} gss_buffer_desc, FAR *gss_buffer_t;
 
 typedef struct gss_channel_bindings_struct {
       OM_uint32 initiator_addrtype;
@@ -70,7 +70,7 @@ typedef struct gss_channel_bindings_struct {
       OM_uint32 acceptor_addrtype;
       gss_buffer_desc acceptor_address;
       gss_buffer_desc application_data;
-} *gss_channel_bindings_t;
+} FAR *gss_channel_bindings_t;
 
 
 /*
@@ -233,174 +233,174 @@ typedef struct gss_channel_bindings_struct {
  */
 
 OM_uint32 INTERFACE gss_acquire_cred
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_name_t,       /* desired_name */
-            OM_uint32,        /* time_req */
-            gss_OID_set,      /* desired_mechs */
-            int,              /* cred_usage */
-            gss_cred_id_t*,   /* output_cred_handle */
-            gss_OID_set*,     /* actual_mechs */
-            OM_uint32*        /* time_rec */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_name_t,         /* desired_name */
+            OM_uint32,        	/* time_req */
+            gss_OID_set,      	/* desired_mechs */
+            int,              	/* cred_usage */
+            gss_cred_id_t FAR *,/* output_cred_handle */
+            gss_OID_set FAR *,  /* actual_mechs */
+            OM_uint32 FAR *     /* time_rec */
            ));
 
 OM_uint32 INTERFACE gss_release_cred
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_cred_id_t*    /* cred_handle */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_cred_id_t FAR * /* cred_handle */
            ));
 
 OM_uint32 INTERFACE gss_init_sec_context
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_cred_id_t,    /* claimant_cred_handle */
-            gss_ctx_id_t*,    /* context_handle */
-            gss_name_t,       /* target_name */
-            const_gss_OID,    /* mech_type */
-            int,              /* req_flags */
-            OM_uint32,        /* time_req */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_cred_id_t,    	/* claimant_cred_handle */
+            gss_ctx_id_t FAR *, /* context_handle */
+            gss_name_t,       	/* target_name */
+            const_gss_OID,   	/* mech_type */
+            int,              	/* req_flags */
+            OM_uint32,        	/* time_req */
             gss_channel_bindings_t,
-                              /* input_chan_bindings */
-            gss_buffer_t,     /* input_token */
-            gss_OID*,         /* actual_mech_type */
-            gss_buffer_t,     /* output_token */
-            int*,             /* ret_flags */
-            OM_uint32*        /* time_rec */
+                              	/* input_chan_bindings */
+            gss_buffer_t,     	/* input_token */
+            gss_OID FAR *,      /* actual_mech_type */
+            gss_buffer_t,     	/* output_token */
+            int FAR *,          /* ret_flags */
+            OM_uint32 FAR *     /* time_rec */
            ));
 
 OM_uint32 INTERFACE gss_accept_sec_context
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_ctx_id_t*,    /* context_handle */
-            gss_cred_id_t,    /* verifier_cred_handle */
-            gss_buffer_t,     /* input_token_buffer */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_ctx_id_t FAR *, /* context_handle */
+            gss_cred_id_t,    	/* verifier_cred_handle */
+            gss_buffer_t,     	/* input_token_buffer */
             gss_channel_bindings_t,
-                              /* input_chan_bindings */
-            gss_name_t*,      /* src_name */
-            gss_OID*,         /* mech_type */
-            gss_buffer_t,     /* output_token */
-            int*,             /* ret_flags */
-            OM_uint32*,       /* time_rec */
-            gss_cred_id_t*    /* delegated_cred_handle */
+                              	/* input_chan_bindings */
+            gss_name_t FAR *,   /* src_name */
+            gss_OID FAR *,      /* mech_type */
+            gss_buffer_t,     	/* output_token */
+            int FAR *,          /* ret_flags */
+            OM_uint32 FAR *,    /* time_rec */
+            gss_cred_id_t FAR * /* delegated_cred_handle */
            ));
 
 OM_uint32 INTERFACE gss_process_context_token
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_ctx_id_t,     /* context_handle */
-            gss_buffer_t      /* token_buffer */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_ctx_id_t,     	/* context_handle */
+            gss_buffer_t      	/* token_buffer */
            ));
 
 OM_uint32 INTERFACE gss_delete_sec_context
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_ctx_id_t*,    /* context_handle */
-            gss_buffer_t      /* output_token */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_ctx_id_t FAR *, /* context_handle */
+            gss_buffer_t      	/* output_token */
            ));
 
 OM_uint32 INTERFACE gss_context_time
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_ctx_id_t,     /* context_handle */
-            OM_uint32*        /* time_rec */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_ctx_id_t,     	/* context_handle */
+            OM_uint32 FAR *     /* time_rec */
            ));
 
 OM_uint32 INTERFACE gss_sign
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_ctx_id_t,     /* context_handle */
-            int,              /* qop_req */
-            gss_buffer_t,     /* message_buffer */
-            gss_buffer_t      /* message_token */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_ctx_id_t,     	/* context_handle */
+            int,              	/* qop_req */
+            gss_buffer_t,     	/* message_buffer */
+            gss_buffer_t      	/* message_token */
            ));
 
-OM_uint32 INTERFACE INTERFACE gss_verify
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_ctx_id_t,     /* context_handle */
-            gss_buffer_t,     /* message_buffer */
-            gss_buffer_t,     /* token_buffer */
-            int*              /* qop_state */
+OM_uint32 INTERFACE gss_verify
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_ctx_id_t,     	/* context_handle */
+            gss_buffer_t,     	/* message_buffer */
+            gss_buffer_t,     	/* token_buffer */
+            int FAR *           /* qop_state */
            ));
 
 OM_uint32 INTERFACE gss_seal
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_ctx_id_t,     /* context_handle */
-            int,              /* conf_req_flag */
-            int,              /* qop_req */
-            gss_buffer_t,     /* input_message_buffer */
-            int*,             /* conf_state */
-            gss_buffer_t      /* output_message_buffer */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_ctx_id_t,     	/* context_handle */
+            int,              	/* conf_req_flag */
+            int,              	/* qop_req */
+            gss_buffer_t,     	/* input_message_buffer */
+            int FAR *,          /* conf_state */
+            gss_buffer_t      	/* output_message_buffer */
            ));
 
 OM_uint32 INTERFACE gss_unseal
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_ctx_id_t,     /* context_handle */
-            gss_buffer_t,     /* input_message_buffer */
-            gss_buffer_t,     /* output_message_buffer */
-            int*,             /* conf_state */
-            int*              /* qop_state */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_ctx_id_t,     	/* context_handle */
+            gss_buffer_t,     	/* input_message_buffer */
+            gss_buffer_t,     	/* output_message_buffer */
+            int FAR *,          /* conf_state */
+            int FAR *           /* qop_state */
            ));
 
 OM_uint32 INTERFACE gss_display_status
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            OM_uint32,        /* status_value */
-            int,              /* status_type */
-            const_gss_OID,    /* mech_type */
-            int*,             /* message_context */
-            gss_buffer_t      /* status_string */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            OM_uint32,        	/* status_value */
+            int,              	/* status_type */
+            const_gss_OID,    	/* mech_type */
+            int FAR *,          /* message_context */
+            gss_buffer_t      	/* status_string */
            ));
 
 OM_uint32 INTERFACE gss_indicate_mechs
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_OID_set*      /* mech_set */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_OID_set FAR *   /* mech_set */
            ));
 
 OM_uint32 INTERFACE gss_compare_name
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_name_t,       /* name1 */
-            gss_name_t,       /* name2 */
-            int*              /* name_equal */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_name_t,       	/* name1 */
+            gss_name_t,       	/* name2 */
+            int FAR *           /* name_equal */
            ));
 
 OM_uint32 INTERFACE gss_display_name
-PROTOTYPE( (OM_uint32*,      /* minor_status */
-            gss_name_t,      /* input_name */
-            gss_buffer_t,     /* output_name_buffer */
-            gss_OID*         /* output_name_type */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_name_t,      	/* input_name */
+            gss_buffer_t,     	/* output_name_buffer */
+            gss_OID FAR *       /* output_name_type */
            ));
 
 OM_uint32 INTERFACE gss_import_name
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_buffer_t,     /* input_name_buffer */
-            const_gss_OID,    /* input_name_type */
-            gss_name_t*       /* output_name */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_buffer_t,     	/* input_name_buffer */
+            const_gss_OID,    	/* input_name_type */
+            gss_name_t FAR *    /* output_name */
            ));
 
 OM_uint32 INTERFACE gss_release_name
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_name_t*       /* input_name */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_name_t FAR *    /* input_name */
            ));
 
 OM_uint32 INTERFACE gss_release_buffer
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_buffer_t      /* buffer */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_buffer_t      	/* buffer */
            ));
 
 OM_uint32 INTERFACE gss_release_oid_set
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_OID_set*      /* set */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_OID_set FAR *   /* set */
            ));
 
 OM_uint32 INTERFACE gss_inquire_cred
-PROTOTYPE( (OM_uint32 *,      /* minor_status */
-            gss_cred_id_t,    /* cred_handle */
-            gss_name_t *,     /* name */
-            OM_uint32 *,      /* lifetime */
-            int *,            /* cred_usage */
-            gss_OID_set *     /* mechanisms */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_cred_id_t,    	/* cred_handle */
+            gss_name_t FAR *,   /* name */
+            OM_uint32 FAR *,    /* lifetime */
+            int FAR *,          /* cred_usage */
+            gss_OID_set FAR *   /* mechanisms */
            ));
 
 OM_uint32 INTERFACE gss_inquire_context
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-	    gss_ctx_id_t,     /* context_handle */
-	    gss_name_t*,      /* initiator_name */
-	    gss_name_t*,      /* acceptor_name */
-	    OM_uint32*,       /* lifetime_rec */
-	    gss_OID*,         /* mech_type */
-	    int*,             /* ret_flags */
-	    int*              /* locally_initiated */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+	    gss_ctx_id_t,     	/* context_handle */
+	    gss_name_t FAR *,   /* initiator_name */
+	    gss_name_t FAR *,   /* acceptor_name */
+	    OM_uint32 FAR *,    /* lifetime_rec */
+	    gss_OID FAR *,      /* mech_type */
+	    int FAR *,          /* ret_flags */
+	    int FAR *           /* locally_initiated */
 	   ));
 
 
diff --git a/src/lib/gssapi/generic/gssapiP_generic.h b/src/lib/gssapi/generic/gssapiP_generic.h
index d8d86bb6a7..49a876bf9f 100644
--- a/src/lib/gssapi/generic/gssapiP_generic.h
+++ b/src/lib/gssapi/generic/gssapiP_generic.h
@@ -76,51 +76,51 @@
 
 /** helper functions **/
 
-int INTERFACE g_save_name PROTOTYPE((void **vdb, gss_name_t *name));
-int INTERFACE g_save_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
-int INTERFACE g_save_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
+int g_save_name PROTOTYPE((void **vdb, gss_name_t *name));
+int g_save_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
+int g_save_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
 
-int INTERFACE g_validate_name PROTOTYPE((void **vdb, gss_name_t *name));
-int INTERFACE g_validate_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
-int INTERFACE g_validate_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
+int g_validate_name PROTOTYPE((void **vdb, gss_name_t *name));
+int g_validate_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
+int g_validate_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
 
-int INTERFACE g_delete_name PROTOTYPE((void **vdb, gss_name_t *name));
-int INTERFACE g_delete_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
-int INTERFACE g_delete_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
+int g_delete_name PROTOTYPE((void **vdb, gss_name_t *name));
+int g_delete_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
+int g_delete_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
 
-int INTERFACE g_make_string_buffer PROTOTYPE((const char *str, gss_buffer_t buffer));
+int g_make_string_buffer PROTOTYPE((const char *str, gss_buffer_t buffer));
 
-int INTERFACE g_copy_OID_set PROTOTYPE((const gss_OID_set_desc * const in, gss_OID_set *out));
+int g_copy_OID_set PROTOTYPE((const gss_OID_set_desc * const in, gss_OID_set *out));
 
-int INTERFACE g_token_size PROTOTYPE((const_gss_OID mech, unsigned int body_size));
+int g_token_size PROTOTYPE((const_gss_OID mech, unsigned int body_size));
 
-void INTERFACE g_make_token_header PROTOTYPE((const_gss_OID mech, int body_size,
+void g_make_token_header PROTOTYPE((const_gss_OID mech, int body_size,
 			  unsigned char **buf, int tok_type));
 
-int INTERFACE g_verify_token_header PROTOTYPE((const_gss_OID mech, int *body_size,
+int g_verify_token_header PROTOTYPE((const_gss_OID mech, int *body_size,
 			  unsigned char **buf, int tok_type, int toksize));
 
-OM_uint32 INTERFACE g_display_major_status PROTOTYPE((OM_uint32 *minor_status,
+OM_uint32 g_display_major_status PROTOTYPE((OM_uint32 *minor_status,
 				 OM_uint32 status_value,
 				 int *message_context,
 				 gss_buffer_t status_string));
 
-OM_uint32 INTERFACE INTERFACE g_display_com_err_status PROTOTYPE((OM_uint32 *minor_status,
+OM_uint32 g_display_com_err_status PROTOTYPE((OM_uint32 *minor_status,
 				   OM_uint32 status_value,
 				   gss_buffer_t status_string));
 
-char * INTERFACE g_canonicalize_host PROTOTYPE((char *hostname));
+char * g_canonicalize_host PROTOTYPE((char *hostname));
 
-char * INTERFACE g_strdup PROTOTYPE((char *str));
+char * g_strdup PROTOTYPE((char *str));
 
 /** declarations of internal name mechanism functions **/
 
-OM_uint32 INTERFACE generic_gss_release_buffer
+OM_uint32 generic_gss_release_buffer
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_buffer_t      /* buffer */
            ));
 
-OM_uint32 INTERFACE generic_gss_release_oid_set
+OM_uint32 generic_gss_release_oid_set
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_OID_set*      /* set */
            ));
diff --git a/src/lib/gssapi/generic/gssapi_generic.h b/src/lib/gssapi/generic/gssapi_generic.h
index f8f89e3c46..9073840dea 100644
--- a/src/lib/gssapi/generic/gssapi_generic.h
+++ b/src/lib/gssapi/generic/gssapi_generic.h
@@ -25,9 +25,9 @@
 
 #include <gssapi/gssapi.h>
 
-extern const gss_OID_desc * const gss_nt_user_name;
-extern const gss_OID_desc * const gss_nt_machine_uid_name;
-extern const gss_OID_desc * const gss_nt_string_uid_name;
-extern const gss_OID_desc * const gss_nt_service_name;
+extern const gss_OID_desc FAR * const gss_nt_user_name;
+extern const gss_OID_desc FAR * const gss_nt_machine_uid_name;
+extern const gss_OID_desc FAR * const gss_nt_string_uid_name;
+extern const gss_OID_desc FAR * const gss_nt_service_name;
 
 #endif /* _GSSAPI_GENERIC_H_ */
diff --git a/src/lib/gssapi/generic/rel_buffer.c b/src/lib/gssapi/generic/rel_buffer.c
index 2345fc4b0d..b764a5b5f2 100644
--- a/src/lib/gssapi/generic/rel_buffer.c
+++ b/src/lib/gssapi/generic/rel_buffer.c
@@ -22,7 +22,7 @@
 
 #include "gssapiP_generic.h"
 
-OM_uint32 INTERFACE generic_gss_release_buffer(minor_status, buffer)
+OM_uint32 generic_gss_release_buffer(minor_status, buffer)
      OM_uint32 *minor_status;
      gss_buffer_t buffer;
 {
diff --git a/src/lib/gssapi/generic/rel_oid_set.c b/src/lib/gssapi/generic/rel_oid_set.c
index 073664a192..2edfe9a39a 100644
--- a/src/lib/gssapi/generic/rel_oid_set.c
+++ b/src/lib/gssapi/generic/rel_oid_set.c
@@ -22,7 +22,7 @@
 
 #include "gssapiP_generic.h"
 
-OM_uint32 INTERFACE generic_gss_release_oid_set(minor_status, set)
+OM_uint32 generic_gss_release_oid_set(minor_status, set)
      OM_uint32 *minor_status;
      gss_OID_set *set;
 {
diff --git a/src/lib/gssapi/generic/util_buffer.c b/src/lib/gssapi/generic/util_buffer.c
index 5fd06721c2..cf144495f8 100644
--- a/src/lib/gssapi/generic/util_buffer.c
+++ b/src/lib/gssapi/generic/util_buffer.c
@@ -27,7 +27,7 @@
    make sure that buffer is consistent (release'able) when this
    function exits, no matter what the exit value */
 
-int INTERFACE g_make_string_buffer(str, buffer)
+int g_make_string_buffer(str, buffer)
      const char *str;
      gss_buffer_t buffer;
 {
diff --git a/src/lib/gssapi/generic/util_canonhost.c b/src/lib/gssapi/generic/util_canonhost.c
index 409435f029..712d0ee077 100644
--- a/src/lib/gssapi/generic/util_canonhost.c
+++ b/src/lib/gssapi/generic/util_canonhost.c
@@ -28,7 +28,7 @@
 #include <ctype.h>
 #include <string.h>
 
-char * INTERFACE
+char *
 g_canonicalize_host(hostname)
      char *hostname;
 {
diff --git a/src/lib/gssapi/generic/util_dup.c b/src/lib/gssapi/generic/util_dup.c
index d6ce11824a..6b19092db8 100644
--- a/src/lib/gssapi/generic/util_dup.c
+++ b/src/lib/gssapi/generic/util_dup.c
@@ -23,7 +23,7 @@
 #include "gssapiP_generic.h"
 #include <string.h>
 
-char * INTERFACE g_strdup(str)
+char * g_strdup(str)
      char *str;
 {
    char *ret;
diff --git a/src/lib/gssapi/generic/util_oid.c b/src/lib/gssapi/generic/util_oid.c
index 8f3d434eb6..c415aad76f 100644
--- a/src/lib/gssapi/generic/util_oid.c
+++ b/src/lib/gssapi/generic/util_oid.c
@@ -22,7 +22,7 @@
 
 #include "gssapiP_generic.h"
 
-int INTERFACE
+int
 g_copy_OID_set(in, out)
      const gss_OID_set_desc * const in;
      gss_OID_set *out;
diff --git a/src/lib/gssapi/generic/util_token.c b/src/lib/gssapi/generic/util_token.c
index c5067fde95..c378198943 100644
--- a/src/lib/gssapi/generic/util_token.c
+++ b/src/lib/gssapi/generic/util_token.c
@@ -111,7 +111,7 @@ static int der_read_length(buf, bufsize)
 
 /* returns the length of a token, given the mech oid and the body size */
 
-int INTERFACE g_token_size(mech, body_size)
+int g_token_size(mech, body_size)
      const_gss_OID mech;
      unsigned int body_size;
 {
@@ -123,7 +123,7 @@ int INTERFACE g_token_size(mech, body_size)
 /* fills in a buffer with the token header.  The buffer is assumed to
    be the right size.  buf is advanced past the token header */
 
-void INTERFACE g_make_token_header(mech, body_size, buf, tok_type)
+void g_make_token_header(mech, body_size, buf, tok_type)
      const_gss_OID mech;
      int body_size;
      unsigned char **buf;
@@ -142,7 +142,7 @@ void INTERFACE g_make_token_header(mech, body_size, buf, tok_type)
    leaving buf advanced past the token header, and setting body_size
    to the number of remaining bytes */
 
-int INTERFACE g_verify_token_header(mech, body_size, buf, tok_type, toksize)
+int g_verify_token_header(mech, body_size, buf, tok_type, toksize)
      const_gss_OID mech;
      int *body_size;
      unsigned char **buf;
diff --git a/src/lib/gssapi/generic/util_validate.c b/src/lib/gssapi/generic/util_validate.c
index e60ed427b0..72631341ba 100644
--- a/src/lib/gssapi/generic/util_validate.c
+++ b/src/lib/gssapi/generic/util_validate.c
@@ -105,45 +105,45 @@ static int g_delete(DB **vdb, int type, void *ptr)
 
 /* save */
 
-int INTERFACE g_save_name(void **vdb, gss_name_t *name)
+int g_save_name(void **vdb, gss_name_t *name)
 {
    return(g_save((DB **) vdb, V_NAME, (void *) name));
 }
-int INTERFACE g_save_cred_id(void **vdb, gss_cred_id_t *cred)
+int g_save_cred_id(void **vdb, gss_cred_id_t *cred)
 {
    return(g_save((DB **) vdb, V_CRED_ID, (void *) cred));
 }
-int INTERFACE g_save_ctx_id(void **vdb, gss_ctx_id_t *ctx)
+int g_save_ctx_id(void **vdb, gss_ctx_id_t *ctx)
 {
    return(g_save((DB **) vdb, V_CTX_ID, (void *) ctx));
 }
 
 /* validate */
 
-int INTERFACE g_validate_name(void **vdb, gss_name_t *name)
+int g_validate_name(void **vdb, gss_name_t *name)
 {
    return(g_validate((DB **) vdb, V_NAME, (void *) name));
 }
-int INTERFACE g_validate_cred_id(void **vdb, gss_cred_id_t *cred)
+int g_validate_cred_id(void **vdb, gss_cred_id_t *cred)
 {
    return(g_validate((DB **) vdb, V_CRED_ID, (void *) cred));
 }
-int INTERFACE g_validate_ctx_id(void **vdb, gss_ctx_id_t *ctx)
+int g_validate_ctx_id(void **vdb, gss_ctx_id_t *ctx)
 {
    return(g_validate((DB **) vdb, V_CTX_ID, (void *) ctx));
 }
 
 /* delete */
 
-int INTERFACE g_delete_name(void **vdb, gss_name_t *name)
+int g_delete_name(void **vdb, gss_name_t *name)
 {
    return(g_delete((DB **) vdb, V_NAME, (void *) name));
 }
-int INTERFACE g_delete_cred_id(void **vdb, gss_cred_id_t *cred)
+int g_delete_cred_id(void **vdb, gss_cred_id_t *cred)
 {
    return(g_delete((DB **) vdb, V_CRED_ID, (void *) cred));
 }
-int INTERFACE g_delete_ctx_id(void **vdb, gss_ctx_id_t *ctx)
+int g_delete_ctx_id(void **vdb, gss_ctx_id_t *ctx)
 {
    return(g_delete((DB **) vdb, V_CTX_ID, (void *) ctx));
 }
diff --git a/src/lib/gssapi/generic/utl_nohash_validate.c b/src/lib/gssapi/generic/utl_nohash_validate.c
index 88ad5937cd..eaa83d34dd 100644
--- a/src/lib/gssapi/generic/utl_nohash_validate.c
+++ b/src/lib/gssapi/generic/utl_nohash_validate.c
@@ -33,19 +33,19 @@
 
 /* save */
 
-int INTERFACE g_save_name(vdb, name)
+int g_save_name(vdb, name)
      void **vdb;
      gss_name_t *name;
 {
 	return 1;
 }
-int INTERFACE g_save_cred_id(vdb, cred)
+int g_save_cred_id(vdb, cred)
      void **vdb;
      gss_cred_id_t *cred;
 {
 	return 1;
 }
-int INTERFACE g_save_ctx_id(vdb, ctx)
+int g_save_ctx_id(vdb, ctx)
      void **vdb;
      gss_ctx_id_t *ctx;
 {
@@ -54,19 +54,19 @@ int INTERFACE g_save_ctx_id(vdb, ctx)
 
 /* validate */
 
-int INTERFACE g_validate_name(vdb, name)
+int g_validate_name(vdb, name)
      void **vdb;
      gss_name_t *name;
 {
 	return 1;
 }
-int INTERFACE g_validate_cred_id(vdb, cred)
+int g_validate_cred_id(vdb, cred)
      void **vdb;
      gss_cred_id_t *cred;
 {
 	return 1;
 }
-int INTERFACE g_validate_ctx_id(vdb, ctx)
+int g_validate_ctx_id(vdb, ctx)
      void **vdb;
      gss_ctx_id_t *ctx;
 {
@@ -75,19 +75,19 @@ int INTERFACE g_validate_ctx_id(vdb, ctx)
 
 /* delete */
 
-int INTERFACE g_delete_name(vdb, name)
+int g_delete_name(vdb, name)
      void **vdb;
      gss_name_t *name;
 {
 	return 1;
 }
-int INTERFACE g_delete_cred_id(vdb, cred)
+int g_delete_cred_id(vdb, cred)
      void **vdb;
      gss_cred_id_t *cred;
 {
 	return 1;
 }
-int INTERFACE g_delete_ctx_id(vdb, ctx)
+int g_delete_ctx_id(vdb, ctx)
      void **vdb;
      gss_ctx_id_t *ctx;
 {