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

1 files changed, 117 insertions, 117 deletions

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 */
 	   ));