* g_compare_name.c, g_delete_sec_context.c, g_dsp_status.c,

	g_exp_sec_context.c, g_imp_sec_context.c, g_rel_buffer.c,
	g_rel_cred.c, g_rel_name.c, g_rel_oid_set.c, get_mechanism.c,
	get_mtype.c: Include stdlib.h and string.h as needed

	* mglueP.h: Add many invocations of NPROTOTYPE and PROTOTYPE to
		prevent breakage.

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

diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index f74ad1734c7c1cd96edf1bc5fe03798fb0f6ac83..5f05697fbcad4be3051add9c14dbcecdea7a7bb2 100644 (file)
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jan 24 20:48:15 1996  Tom Yu  <tlyu@dragons-lair.MIT.EDU>
+
+       * gssapi.h: Added definition of NPROTOTYPE to dtrt with Ultrix,
+               etc.  Also added special case for Ultrix (limited
+               prototype support).
+
 Tue Jan 23 03:28:41 1996  Theodore Y. Ts'o  <tytso@dcl>
 
        * gssapiP_generic.h: Removed prototypes of functions that have

diff --git a/src/lib/gssapi/generic/gssapi.h b/src/lib/gssapi/generic/gssapi.h
index 7de803473b46625925480bd6c105d7d63adb0e8d..a0b5828b4522365812968027a7e5f08d053a5d60 100644 (file)
--- a/src/lib/gssapi/generic/gssapi.h
+++ b/src/lib/gssapi/generic/gssapi.h
@@ -78,13 +78,21 @@
  * Make sure we have a definition for PROTOTYPE.
  */
 #if !defined(PROTOTYPE)
-#if defined(__STDC__) || defined(_WINDOWS)
+#if defined(__STDC__) || defined(_WINDOWS) || defined(__ultrix)
 #define PROTOTYPE(x) x
 #else
 #define PROTOTYPE(x) ()
 #endif
 #endif
 
+#ifndef NPROTOTYPE
+#if defined(__ultrix) && !defined (__GNUC__)
+#define NPROTOTYPE(x) ()
+#else
+#define NPROTOTYPE(x) PROTOTYPE(x)
+#endif
+#endif
+
 /*
  * First, include stddef.h to get size_t defined.
  */

diff --git a/src/lib/gssapi/mechglue/ChangeLog b/src/lib/gssapi/mechglue/ChangeLog
index d082892f9fd3ccbe057816737dee3a7c514341ca..143342cd47c95dc9d3fac69e13cf4dfdd1b84154 100644 (file)
--- a/src/lib/gssapi/mechglue/ChangeLog
+++ b/src/lib/gssapi/mechglue/ChangeLog
@@ -1,3 +1,13 @@
+Wed Jan 24 20:49:13 1996  Tom Yu  <tlyu@dragons-lair.MIT.EDU>
+
+       * g_compare_name.c, g_delete_sec_context.c, g_dsp_status.c,
+       g_exp_sec_context.c, g_imp_sec_context.c, g_rel_buffer.c,
+       g_rel_cred.c, g_rel_name.c, g_rel_oid_set.c, get_mechanism.c,
+       get_mtype.c: Include stdlib.h and string.h as needed
+
+       * mglueP.h: Add many invocations of NPROTOTYPE and PROTOTYPE to
+               prevent breakage.
+
 Tue Jan 23 11:52:24 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
        * add_mechanism.c, g_inquire_cred.c, g_imp_name.c,

diff --git a/src/lib/gssapi/mechglue/g_compare_name.c b/src/lib/gssapi/mechglue/g_compare_name.c
index e521004ab4c5b4d2a1578d95db4ac7227314d66b..ec575aa7eef2f4bc20b91a262ad50eee827a050b 100644 (file)
--- a/src/lib/gssapi/mechglue/g_compare_name.c
+++ b/src/lib/gssapi/mechglue/g_compare_name.c
@@ -7,6 +7,10 @@
  */
 
 #include "mglueP.h"
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#include <string.h>
 
 OM_uint32
 gss_compare_name (minor_status,

diff --git a/src/lib/gssapi/mechglue/g_delete_sec_context.c b/src/lib/gssapi/mechglue/g_delete_sec_context.c
index 6bc3c2be62d6e0b20c2ed0d5d1afde5146957004..5ac2dbf55eaf5d6c8847e08c6a062b31b1b891ec 100644 (file)
--- a/src/lib/gssapi/mechglue/g_delete_sec_context.c
+++ b/src/lib/gssapi/mechglue/g_delete_sec_context.c
@@ -7,6 +7,9 @@
  */
 
 #include "mglueP.h"
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
 
 OM_uint32
 gss_delete_sec_context (minor_status,

diff --git a/src/lib/gssapi/mechglue/g_dsp_status.c b/src/lib/gssapi/mechglue/g_dsp_status.c
index 29542df2cdbf495676dc8f26be8a674f99feef64..e31bb5e4436247c40227202b456d99026da97722 100644 (file)
--- a/src/lib/gssapi/mechglue/g_dsp_status.c
+++ b/src/lib/gssapi/mechglue/g_dsp_status.c
@@ -7,6 +7,9 @@
  */
 
 #include "mglueP.h"
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
 
 OM_uint32
 gss_display_status (minor_status,

diff --git a/src/lib/gssapi/mechglue/g_exp_sec_context.c b/src/lib/gssapi/mechglue/g_exp_sec_context.c
index 1bb7a67a6857cdf995b68334f771099de085a037..b0b66b50ab4d7fb6d9704d07abdc84427f32458b 100644 (file)
--- a/src/lib/gssapi/mechglue/g_exp_sec_context.c
+++ b/src/lib/gssapi/mechglue/g_exp_sec_context.c
@@ -9,6 +9,9 @@
  */
 
 #include "mglueP.h"
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
 
 OM_uint32
 gss_export_sec_context(minor_status,

diff --git a/src/lib/gssapi/mechglue/g_imp_sec_context.c b/src/lib/gssapi/mechglue/g_imp_sec_context.c
index dde516addd50eb35d320735e2c8650a8fc017143..63cd145779b2f9fa599f4dddc715b53a4532957c 100644 (file)
--- a/src/lib/gssapi/mechglue/g_imp_sec_context.c
+++ b/src/lib/gssapi/mechglue/g_imp_sec_context.c
@@ -9,6 +9,9 @@
  */
 
 #include "mglueP.h"
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
 
 OM_uint32
 gss_import_sec_context(minor_status,

diff --git a/src/lib/gssapi/mechglue/g_rel_buffer.c b/src/lib/gssapi/mechglue/g_rel_buffer.c
index 86a13d50694370e2b81119b563d7121f4b322285..ef1408386e31cfaf326a58db4a71445da6b1a213 100644 (file)
--- a/src/lib/gssapi/mechglue/g_rel_buffer.c
+++ b/src/lib/gssapi/mechglue/g_rel_buffer.c
@@ -7,6 +7,9 @@
  */
 
 #include "mglueP.h"
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
 
 OM_uint32
 gss_release_buffer (minor_status,

diff --git a/src/lib/gssapi/mechglue/g_rel_cred.c b/src/lib/gssapi/mechglue/g_rel_cred.c
index fc30c2801399c0351a0b7a8e4f1c0e5db5b471e8..6f953da7090acbbc0b15f0280016c68eab9b7909 100644 (file)
--- a/src/lib/gssapi/mechglue/g_rel_cred.c
+++ b/src/lib/gssapi/mechglue/g_rel_cred.c
@@ -7,6 +7,9 @@
  */
 
 #include "mglueP.h"
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
 
 OM_uint32
 gss_release_cred(minor_status,

diff --git a/src/lib/gssapi/mechglue/g_rel_name.c b/src/lib/gssapi/mechglue/g_rel_name.c
index 9e288112aa57a34c7045d3cc6363581b19b93bed..06fd0a36a01bd45490f0556cefcc9912c97f0882 100644 (file)
--- a/src/lib/gssapi/mechglue/g_rel_name.c
+++ b/src/lib/gssapi/mechglue/g_rel_name.c
@@ -7,6 +7,10 @@
  */
 
 #include "mglueP.h"
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#include <string.h>
 
 OM_uint32
 gss_release_name (minor_status,

diff --git a/src/lib/gssapi/mechglue/g_rel_oid_set.c b/src/lib/gssapi/mechglue/g_rel_oid_set.c
index ebb84530ed4eca7c9f4d8673204a1a46fde01e10..4bcdd3e082c81b66070502e372660282c94b6a98 100644 (file)
--- a/src/lib/gssapi/mechglue/g_rel_oid_set.c
+++ b/src/lib/gssapi/mechglue/g_rel_oid_set.c
@@ -7,6 +7,9 @@
  */
 
 #include "mglueP.h"
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
 
 OM_uint32
 gss_release_oid_set (minor_status,

diff --git a/src/lib/gssapi/mechglue/get_mechanism.c b/src/lib/gssapi/mechglue/get_mechanism.c
index b72020da209c4aa00c8d17b0486806d1c85aea2c..ef600fd8da8715fcba5f2b913256b681cb7cc6ad 100644 (file)
--- a/src/lib/gssapi/mechglue/get_mechanism.c
+++ b/src/lib/gssapi/mechglue/get_mechanism.c
@@ -10,6 +10,10 @@
  */
 
 #include "mglueP.h"
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#include <string.h>
 
 extern gss_mechanism *mechs_array;
 

diff --git a/src/lib/gssapi/mechglue/get_mtype.c b/src/lib/gssapi/mechglue/get_mtype.c
index 6ac9b5db846103bb5132e8a198d098e50449fc55..618b344d3d156b7f5bf48c9bd3df566cbf2d0b5c 100644 (file)
--- a/src/lib/gssapi/mechglue/get_mtype.c
+++ b/src/lib/gssapi/mechglue/get_mtype.c
@@ -7,6 +7,9 @@
  */
 
 #include "mglueP.h"
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
 
 OM_uint32 get_mech_type(OID, token)
 

diff --git a/src/lib/gssapi/mechglue/mglueP.h b/src/lib/gssapi/mechglue/mglueP.h
index d0abead43786f9f0f987918fe216535048637c31..bc51100150f468c73e9341f6691dc66423d1ae5b 100644 (file)
--- a/src/lib/gssapi/mechglue/mglueP.h
+++ b/src/lib/gssapi/mechglue/mglueP.h
@@ -69,232 +69,264 @@ typedef struct gss_config {
     gss_OID_desc    mech_type;
     void *         context;
     OM_uint32       (*gss_acquire_cred)
-       (void*,                 /* context */
-        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 */
-        );
+       NPROTOTYPE((
+                   void*,              /* context */
+                   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 */
+                   ));
     OM_uint32       (*gss_release_cred)
-       (void*,                 /* context */                  
-        OM_uint32*,            /* minor_status */
-        gss_cred_id_t*         /* cred_handle */
-        );
+       NPROTOTYPE((
+                   void*,              /* context */                  
+                   OM_uint32*,         /* minor_status */
+                   gss_cred_id_t*      /* cred_handle */
+                   ));
     OM_uint32       (*gss_init_sec_context)
-       (void*,                 /* context */
-        OM_uint32*,            /* minor_status */
-        gss_cred_id_t,         /* claimant_cred_handle */
-        gss_ctx_id_t*,         /* context_handle */
-        gss_name_t,            /* target_name */
-        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 */
-        );
+       NPROTOTYPE((
+                   void*,                      /* context */
+                   OM_uint32*,                 /* minor_status */
+                   gss_cred_id_t,              /* claimant_cred_handle */
+                   gss_ctx_id_t*,              /* context_handle */
+                   gss_name_t,                 /* target_name */
+                   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 */
+                   ));
     OM_uint32       (*gss_accept_sec_context)
-       (void*,                 /* context */
-        OM_uint32*,            /* minor_status */
-        gss_ctx_id_t*,         /* 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 */
-        );
+       NPROTOTYPE((
+                   void*,                      /* context */
+                   OM_uint32*,                 /* minor_status */
+                   gss_ctx_id_t*,              /* 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 */
+                   ));
     OM_uint32       (*gss_process_context_token)
-       (void*,                 /* context */
-        OM_uint32*,            /* minor_status */
-        gss_ctx_id_t,          /* context_handle */
-        gss_buffer_t           /* token_buffer */
-        );
+       NPROTOTYPE((
+                   void*,              /* context */
+                   OM_uint32*,         /* minor_status */
+                   gss_ctx_id_t,       /* context_handle */
+                   gss_buffer_t        /* token_buffer */
+                   ));
     OM_uint32       (*gss_delete_sec_context)
-       (void*,                 /* context */
-        OM_uint32*,            /* minor_status */
-        gss_ctx_id_t*,         /* context_handle */
-        gss_buffer_t           /* output_token */
-        );
+       NPROTOTYPE((
+                   void*,              /* context */
+                   OM_uint32*,         /* minor_status */
+                   gss_ctx_id_t*,      /* context_handle */
+                   gss_buffer_t        /* output_token */
+                   ));
     OM_uint32       (*gss_context_time)
-       (void*,                 /* context */
-        OM_uint32*,            /* minor_status */
-        gss_ctx_id_t,          /* context_handle */
-        OM_uint32*             /* time_rec */
-        );
+       NPROTOTYPE((
+                   void*,              /* context */
+                   OM_uint32*,         /* minor_status */
+                   gss_ctx_id_t,       /* context_handle */
+                   OM_uint32*          /* time_rec */
+                   ));
     OM_uint32       (*gss_sign)
-       (void*,                 /* context */
-        OM_uint32*,            /* minor_status */
-        gss_ctx_id_t,          /* context_handle */
-        int,                   /* qop_req */
-        gss_buffer_t,          /* message_buffer */
-        gss_buffer_t           /* message_token */
-        );
+       NPROTOTYPE((
+                   void*,              /* context */
+                   OM_uint32*,         /* minor_status */
+                   gss_ctx_id_t,       /* context_handle */
+                   int,                /* qop_req */
+                   gss_buffer_t,       /* message_buffer */
+                   gss_buffer_t        /* message_token */
+                   ));
     OM_uint32       (*gss_verify)
-       (void*,                 /* context */
-        OM_uint32*,            /* minor_status */
-        gss_ctx_id_t,          /* context_handle */
-        gss_buffer_t,          /* message_buffer */
-        gss_buffer_t,          /* token_buffer */
-        int*                   /* qop_state */
-        );
+       NPROTOTYPE((
+                   void*,              /* context */
+                   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       (*gss_seal)
-       (void*,                 /* context */
-        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 */
-        );
+       NPROTOTYPE((
+                   void*,              /* context */
+                   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 */
+                   ));
     OM_uint32       (*gss_unseal)
-       (void*,                 /* context */
-        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 */
-        );
+       NPROTOTYPE((
+                   void*,              /* context */
+                   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 */
+                   ));
     OM_uint32       (*gss_display_status)
-       (void*,                 /* context */
-        OM_uint32*,            /* minor_status */
-        OM_uint32,             /* status_value */
-        int,                   /* status_type */
-        gss_OID,               /* mech_type */
-        int*,                  /* message_context */
-        gss_buffer_t           /* status_string */
-        );
+       NPROTOTYPE((
+                   void*,              /* context */
+                   OM_uint32*,         /* minor_status */
+                   OM_uint32,          /* status_value */
+                   int,                /* status_type */
+                   gss_OID,            /* mech_type */
+                   int*,               /* message_context */
+                   gss_buffer_t        /* status_string */
+                   ));
     OM_uint32       (*gss_indicate_mechs)
-       (void*,                 /* context */
-        OM_uint32*,            /* minor_status */
-        gss_OID_set*           /* mech_set */
-        );
+       NPROTOTYPE((
+                   void*,              /* context */
+                   OM_uint32*,         /* minor_status */
+                   gss_OID_set*        /* mech_set */
+                   ));
     OM_uint32       (*gss_compare_name)
-       (void*,                 /* context */
-        OM_uint32*,            /* minor_status */
-        gss_name_t,            /* name1 */
-        gss_name_t,            /* name2 */
-        int*                   /* name_equal */
-        );
+       NPROTOTYPE((
+                   void*,              /* context */
+                   OM_uint32*,         /* minor_status */
+                   gss_name_t,         /* name1 */
+                   gss_name_t,         /* name2 */
+                   int*                /* name_equal */
+                   ));
     OM_uint32       (*gss_display_name)
-       (void*,                 /* context */
-        OM_uint32*,            /* minor_status */
-        gss_name_t,            /* input_name */
-        gss_buffer_t,          /* output_name_buffer */
-        gss_OID*               /* output_name_type */
-        );
+       NPROTOTYPE((
+                   void*,              /* context */
+                   OM_uint32*,         /* minor_status */
+                   gss_name_t,         /* input_name */
+                   gss_buffer_t,       /* output_name_buffer */
+                   gss_OID*            /* output_name_type */
+                   ));
     OM_uint32       (*gss_import_name)
-       (void*,                 /* context */
-        OM_uint32*,            /* minor_status */
-        gss_buffer_t,          /* input_name_buffer */
-        gss_OID,               /* input_name_type */
-        gss_name_t*            /* output_name */
-        );
+       NPROTOTYPE((
+                   void*,              /* context */
+                   OM_uint32*,         /* minor_status */
+                   gss_buffer_t,       /* input_name_buffer */
+                   gss_OID,            /* input_name_type */
+                   gss_name_t*         /* output_name */
+                   ));
     OM_uint32       (*gss_release_name)
-       (void*,                 /* context */
-        OM_uint32*,            /* minor_status */
-        gss_name_t*            /* input_name */
-        );
+       NPROTOTYPE((
+                   void*,              /* context */
+                   OM_uint32*,         /* minor_status */
+                   gss_name_t*         /* input_name */
+                   ));
     OM_uint32       (*gss_inquire_cred)
-       (void*,                 /* context */
-        OM_uint32 *,           /* minor_status */
-        gss_cred_id_t,         /* cred_handle */
-        gss_name_t *,          /* name */
-        OM_uint32 *,           /* lifetime */
-        int *,                 /* cred_usage */
-        gss_OID_set *          /* mechanisms */
-        );
+       NPROTOTYPE((
+                   void*,                      /* context */
+                   OM_uint32 *,                /* minor_status */
+                   gss_cred_id_t,              /* cred_handle */
+                   gss_name_t *,               /* name */
+                   OM_uint32 *,                /* lifetime */
+                   int *,                      /* cred_usage */
+                   gss_OID_set *               /* mechanisms */
+                   ));
     OM_uint32      (*gss_add_cred)
-       (void*,                 /* context */
-        OM_uint32 *,           /* minor_status */
-        gss_cred_id_t,         /* input_cred_handle */
-        gss_name_t,            /* desired_name */
-        gss_OID,               /* desired_mech */
-        gss_cred_usage_t,      /* cred_usage */
-        OM_uint32,             /* initiator_time_req */
-        OM_uint32,             /* acceptor_time_req */
-        gss_cred_id_t *,       /* output_cred_handle */
-        gss_OID_set *,         /* actual_mechs */
-        OM_uint32 *,           /* initiator_time_rec */
-        OM_uint32 *            /* acceptor_time_rec */
-        );
+       NPROTOTYPE((
+                   void*,              /* context */
+                   OM_uint32 *,        /* minor_status */
+                   gss_cred_id_t,      /* input_cred_handle */
+                   gss_name_t,         /* desired_name */
+                   gss_OID,            /* desired_mech */
+                   gss_cred_usage_t,   /* cred_usage */
+                   OM_uint32,          /* initiator_time_req */
+                   OM_uint32,          /* acceptor_time_req */
+                   gss_cred_id_t *,    /* output_cred_handle */
+                   gss_OID_set *,      /* actual_mechs */
+                   OM_uint32 *,        /* initiator_time_rec */
+                   OM_uint32 *         /* acceptor_time_rec */
+                   ));
     OM_uint32      (*gss_export_sec_context)
-       (void*,                 /* context */
-        OM_uint32 *,           /* minor_status */
-        gss_ctx_id_t *,        /* context_handle */
-        gss_buffer_t           /* interprocess_token */
-        );
+       NPROTOTYPE((
+                   void*,              /* context */
+                   OM_uint32 *,        /* minor_status */
+                   gss_ctx_id_t *,     /* context_handle */
+                   gss_buffer_t        /* interprocess_token */
+                   ));
     OM_uint32      (*gss_import_sec_context)
-       (void *,                /* context */
-        OM_uint32 *,           /* minor_status */
-        gss_buffer_t,          /* interprocess_token */
-        gss_ctx_id_t *         /* context_handle */
-        );
+       NPROTOTYPE((
+                   void *,             /* context */
+                   OM_uint32 *,        /* minor_status */
+                   gss_buffer_t,       /* interprocess_token */
+                   gss_ctx_id_t *      /* context_handle */
+                   ));
     OM_uint32      (*gss_inquire_cred_by_mech)
-       (void *,                /* context */
-        OM_uint32 *,           /* minor_status */
-        gss_cred_id_t,         /* cred_handle */
-        gss_OID,               /* mech_type */
-        gss_name_t *,          /* name */
-        OM_uint32 *,           /* initiator_lifetime */
-        OM_uint32 *,           /* acceptor_lifetime */
-        gss_cred_usage_t *     /* cred_usage */
-        );
+       NPROTOTYPE((
+                   void *,             /* context */
+                   OM_uint32 *,        /* minor_status */
+                   gss_cred_id_t,      /* cred_handle */
+                   gss_OID,            /* mech_type */
+                   gss_name_t *,       /* name */
+                   OM_uint32 *,        /* initiator_lifetime */
+                   OM_uint32 *,        /* acceptor_lifetime */
+                   gss_cred_usage_t *  /* cred_usage */
+                   ));
     OM_uint32      (*gss_inquire_names_for_mech)
-       (void *,                /* context */
-        OM_uint32 *,           /* minor_status */
-        gss_OID,               /* mechanism */
-        gss_OID_set *          /* name_types */
-        );
+       NPROTOTYPE((
+                   void *,             /* context */
+                   OM_uint32 *,        /* minor_status */
+                   gss_OID,            /* mechanism */
+                   gss_OID_set *       /* name_types */
+                   ));
     OM_uint32  (*gss_inquire_context)
-       (void *,                /* context */
-        OM_uint32 *,           /* minor_status */
-        gss_ctx_id_t,          /* context_handle */
-        gss_name_t *,          /* src_name */
-        gss_name_t *,          /* targ_name */
-        OM_uint32 *,           /* lifetime_rec */
-        gss_OID *,             /* mech_type */
-        OM_uint32 *,           /* ctx_flags */
-        int *,                 /* locally_initiated */
-        int *                  /* open */
-       );
+       NPROTOTYPE((
+                   void *,             /* context */
+                   OM_uint32 *,        /* minor_status */
+                   gss_ctx_id_t,       /* context_handle */
+                   gss_name_t *,       /* src_name */
+                   gss_name_t *,       /* targ_name */
+                   OM_uint32 *,        /* lifetime_rec */
+                   gss_OID *,          /* mech_type */
+                   OM_uint32 *,        /* ctx_flags */
+                   int *,              /* locally_initiated */
+                   int *               /* open */
+                   ));
     OM_uint32      (*gss_internal_release_oid)
-       (void *,                /* context */
-        OM_uint32 *,           /* minor_status */
-        gss_OID *              /* OID */
-        );
+       NPROTOTYPE((
+                   void *,             /* context */
+                   OM_uint32 *,        /* minor_status */
+                   gss_OID *           /* OID */
+        ));
     int                     (*pname_to_uid)
-       (char *,                /* pname */
-        gss_OID,               /* name type */
-        gss_OID,               /* mech type */
-        uid_t *                /* uid */
-        );
+       NPROTOTYPE((
+                   char *,             /* pname */
+                   gss_OID,            /* name type */
+                   gss_OID,            /* mech type */
+                   uid_t *             /* uid */
+                   ));
 
 } *gss_mechanism;
 
 /********************************************************/
 /* Internal mechglue routines */
 
-gss_mechanism get_mechanism (gss_OID);
-OM_uint32 add_mechanism (gss_mechanism, int);
-OM_uint32 get_mech_type(gss_OID *, gss_buffer_t);
-OM_uint32 import_internal_name (OM_uint32 *, gss_OID, gss_union_name_t,
-                               gss_name_t *);
-OM_uint32 display_internal_name (OM_uint32 *, gss_OID, gss_name_t,
-                                gss_buffer_t, gss_OID *);
-OM_uint32 release_internal_name (OM_uint32 *, gss_OID, gss_name_t *);
+gss_mechanism get_mechanism
+PROTOTYPE((gss_OID));
+OM_uint32 add_mechanism
+PROTOTYPE((gss_mechanism, int));
+OM_uint32 get_mech_type
+PROTOTYPE((gss_OID *, gss_buffer_t));
+OM_uint32 import_internal_name
+PROTOTYPE((OM_uint32 *, gss_OID, gss_union_name_t,
+          gss_name_t *));
+OM_uint32 display_internal_name
+PROTOTYPE((OM_uint32 *, gss_OID, gss_name_t,
+          gss_buffer_t, gss_OID *));
+OM_uint32 release_internal_name
+PROTOTYPE((OM_uint32 *, gss_OID, gss_name_t *));
 
 OM_uint32 generic_gss_release_oid
 PROTOTYPE( (OM_uint32 *,       /* minor_status */