From: Theodore Tso <tytso@mit.edu>
Date: Thu, 21 Mar 1996 01:35:02 +0000 (+0000)
Subject: mechglue.h: Don't include <sys/types.h>; it's included if necessary in
X-Git-Tag: krb5-1.0-beta6~318
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2e172353bd5e48524db0ac4e5e2e63b7e5a947c3;p=krb5.git

mechglue.h: Don't include <sys/types.h>; it's included if necessary in
	gssapi/gssapi.h.  On a Macintosh, #include gssapi.h instead of
	gssapi/gssapi.h.

g_accept_sec_context.c, g_acquire_cred.c, g_compare_name.c,
g_context_time.c, g_delete_sec_context.c, g_dsp_name.c,
g_dsp_status.c, g_exp_sec_context.c, g_glue.c, g_imp_name.c,
g_imp_sec_context.c, g_indicate_mechs.c, g_init_sec_context.c,
g_initialize.c, g_inq_context.c, g_inq_cred.c, g_inq_names.c,
g_process_context.c, g_rel_buffer.c, g_rel_cred.c, g_rel_name.c,
g_rel_oid_set.c, g_seal.c, g_sign.c, g_unseal.c, g_verify.c,
gssd_pname_to_uid.c, mechglue.h, mglueP.h: Comment out #ident line.
	This causes the Macintosh C compiler indigestion.

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

diff --git a/src/lib/gssapi/mechglue/ChangeLog b/src/lib/gssapi/mechglue/ChangeLog
index 9da259bc9..e07d39cdb 100644
--- a/src/lib/gssapi/mechglue/ChangeLog
+++ b/src/lib/gssapi/mechglue/ChangeLog
@@ -1,3 +1,19 @@
+Wed Mar 20 20:20:38 1996  Theodore Y. Ts'o  <tytso@dcl>
+
+	* mechglue.h: Don't include <sys/types.h>; it's included if
+		necessary in gssapi/gssapi.h.  On a Macintosh, #include
+		gssapi.h instead of gssapi/gssapi.h.
+
+	* g_accept_sec_context.c, g_acquire_cred.c, g_compare_name.c,
+	g_context_time.c, g_delete_sec_context.c, g_dsp_name.c,
+	g_dsp_status.c, g_exp_sec_context.c, g_glue.c, g_imp_name.c,
+	g_imp_sec_context.c, g_indicate_mechs.c, g_init_sec_context.c,
+	g_initialize.c, g_inq_context.c, g_inq_cred.c, g_inq_names.c,
+	g_process_context.c, g_rel_buffer.c, g_rel_cred.c, g_rel_name.c,
+	g_rel_oid_set.c, g_seal.c, g_sign.c, g_unseal.c, g_verify.c,
+	gssd_pname_to_uid.c, mechglue.h, mglueP.h: Comment out #ident
+		line.  This causes the Macintosh C compiler indigestion.
+
 Tue Mar 12 23:28:57 1996  Ken Raeburn  <raeburn@cygnus.com>
 
 	* mechglue.h (gssd_pname_to_uid, gss_initialize): Use PROTOTYPE
diff --git a/src/lib/gssapi/mechglue/g_accept_sec_context.c b/src/lib/gssapi/mechglue/g_accept_sec_context.c
index b4ac67d25..286dc2432 100644
--- a/src/lib/gssapi/mechglue/g_accept_sec_context.c
+++ b/src/lib/gssapi/mechglue/g_accept_sec_context.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_accept_sec_context.c 1.19     95/08/07 SMI"
+/* #ident  "@(#)gss_accept_sec_context.c 1.19     95/08/07 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
diff --git a/src/lib/gssapi/mechglue/g_acquire_cred.c b/src/lib/gssapi/mechglue/g_acquire_cred.c
index f6bd7743c..73b5c7d50 100644
--- a/src/lib/gssapi/mechglue/g_acquire_cred.c
+++ b/src/lib/gssapi/mechglue/g_acquire_cred.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_acquire_cred.c 1.19     95/08/07 SMI"
+/* #ident  "@(#)gss_acquire_cred.c 1.19     95/08/07 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
diff --git a/src/lib/gssapi/mechglue/g_compare_name.c b/src/lib/gssapi/mechglue/g_compare_name.c
index 5fb617832..97e08d0f0 100644
--- a/src/lib/gssapi/mechglue/g_compare_name.c
+++ b/src/lib/gssapi/mechglue/g_compare_name.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_compare_name.c 1.13     95/08/02 SMI"
+/* #ident  "@(#)gss_compare_name.c 1.13     95/08/02 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
diff --git a/src/lib/gssapi/mechglue/g_context_time.c b/src/lib/gssapi/mechglue/g_context_time.c
index 826bcb76a..7351564f5 100644
--- a/src/lib/gssapi/mechglue/g_context_time.c
+++ b/src/lib/gssapi/mechglue/g_context_time.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_context_time.c 1.8     95/08/07 SMI"
+/* #ident  "@(#)gss_context_time.c 1.8     95/08/07 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
diff --git a/src/lib/gssapi/mechglue/g_delete_sec_context.c b/src/lib/gssapi/mechglue/g_delete_sec_context.c
index 2bd9d5959..5138569e2 100644
--- a/src/lib/gssapi/mechglue/g_delete_sec_context.c
+++ b/src/lib/gssapi/mechglue/g_delete_sec_context.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_delete_sec_context.c 1.10     95/08/07 SMI"
+/* #ident  "@(#)gss_delete_sec_context.c 1.10     95/08/07 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
diff --git a/src/lib/gssapi/mechglue/g_dsp_name.c b/src/lib/gssapi/mechglue/g_dsp_name.c
index 8dc750567..c7abaf9b1 100644
--- a/src/lib/gssapi/mechglue/g_dsp_name.c
+++ b/src/lib/gssapi/mechglue/g_dsp_name.c
@@ -1,4 +1,4 @@
-#ident  "@(#)g_dsp_name.c 1.2     96/02/06 SMI"
+/* #ident  "@(#)g_dsp_name.c 1.2     96/02/06 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
diff --git a/src/lib/gssapi/mechglue/g_dsp_status.c b/src/lib/gssapi/mechglue/g_dsp_status.c
index 0b629fe41..3c6e5785b 100644
--- a/src/lib/gssapi/mechglue/g_dsp_status.c
+++ b/src/lib/gssapi/mechglue/g_dsp_status.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_display_status.c 1.8     95/08/07 SMI"
+/* #ident  "@(#)gss_display_status.c 1.8     95/08/07 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
diff --git a/src/lib/gssapi/mechglue/g_exp_sec_context.c b/src/lib/gssapi/mechglue/g_exp_sec_context.c
index a3e381f57..1af42ac39 100644
--- a/src/lib/gssapi/mechglue/g_exp_sec_context.c
+++ b/src/lib/gssapi/mechglue/g_exp_sec_context.c
@@ -1,5 +1,4 @@
-
-#ident  "@(#)g_exp_sec_context.c 1.2     96/01/18 SMI"
+/* #ident  "@(#)g_exp_sec_context.c 1.2     96/01/18 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
diff --git a/src/lib/gssapi/mechglue/g_glue.c b/src/lib/gssapi/mechglue/g_glue.c
index 504549278..4e8a0300c 100644
--- a/src/lib/gssapi/mechglue/g_glue.c
+++ b/src/lib/gssapi/mechglue/g_glue.c
@@ -1,5 +1,4 @@
-
-#ident	"@(#)g_glue.c 1.1     96/02/06 SMI"
+/* #ident	"@(#)g_glue.c 1.1     96/02/06 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
diff --git a/src/lib/gssapi/mechglue/g_imp_name.c b/src/lib/gssapi/mechglue/g_imp_name.c
index 0f8d4e72f..3e90d36e4 100644
--- a/src/lib/gssapi/mechglue/g_imp_name.c
+++ b/src/lib/gssapi/mechglue/g_imp_name.c
@@ -1,4 +1,4 @@
-#ident  "@(#)g_imp_name.c 1.2     96/02/06 SMI"
+/* #ident  "@(#)g_imp_name.c 1.2     96/02/06 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
diff --git a/src/lib/gssapi/mechglue/g_imp_sec_context.c b/src/lib/gssapi/mechglue/g_imp_sec_context.c
index fea66e192..9d977c61c 100644
--- a/src/lib/gssapi/mechglue/g_imp_sec_context.c
+++ b/src/lib/gssapi/mechglue/g_imp_sec_context.c
@@ -1,5 +1,4 @@
-
-#ident  "@(#)g_imp_sec_context.c 1.2     96/01/18 SMI"
+/* #ident  "@(#)g_imp_sec_context.c 1.2     96/01/18 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
diff --git a/src/lib/gssapi/mechglue/g_indicate_mechs.c b/src/lib/gssapi/mechglue/g_indicate_mechs.c
index 202be6071..4bf7eed73 100644
--- a/src/lib/gssapi/mechglue/g_indicate_mechs.c
+++ b/src/lib/gssapi/mechglue/g_indicate_mechs.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_indicate_mechs.c 1.13     95/08/04 SMI"
+/* #ident  "@(#)gss_indicate_mechs.c 1.13     95/08/04 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
diff --git a/src/lib/gssapi/mechglue/g_init_sec_context.c b/src/lib/gssapi/mechglue/g_init_sec_context.c
index f0d4f7508..96d678332 100644
--- a/src/lib/gssapi/mechglue/g_init_sec_context.c
+++ b/src/lib/gssapi/mechglue/g_init_sec_context.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_init_sec_context.c 1.20     95/08/07 SMI"
+/* #ident  "@(#)gss_init_sec_context.c 1.20     95/08/07 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
diff --git a/src/lib/gssapi/mechglue/g_initialize.c b/src/lib/gssapi/mechglue/g_initialize.c
index fc936f5c7..cc30e26e7 100644
--- a/src/lib/gssapi/mechglue/g_initialize.c
+++ b/src/lib/gssapi/mechglue/g_initialize.c
@@ -1,4 +1,4 @@
-#ident  "@(#)g_initialize.c 1.2     96/02/06 SMI"
+/* #ident  "@(#)g_initialize.c 1.2     96/02/06 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
diff --git a/src/lib/gssapi/mechglue/g_inq_context.c b/src/lib/gssapi/mechglue/g_inq_context.c
index 44fa77e35..105d203f8 100644
--- a/src/lib/gssapi/mechglue/g_inq_context.c
+++ b/src/lib/gssapi/mechglue/g_inq_context.c
@@ -1,5 +1,4 @@
-
-#ident	"@(#)g_inquire_context.c 1.2     96/01/18 SMI"
+/* #ident	"@(#)g_inquire_context.c 1.2     96/01/18 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
diff --git a/src/lib/gssapi/mechglue/g_inq_cred.c b/src/lib/gssapi/mechglue/g_inq_cred.c
index edfdb3a28..12efbd29f 100644
--- a/src/lib/gssapi/mechglue/g_inq_cred.c
+++ b/src/lib/gssapi/mechglue/g_inq_cred.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_inquire_cred.c 1.9     95/08/02 SMI"
+/* #ident  "@(#)gss_inquire_cred.c 1.9     95/08/02 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
diff --git a/src/lib/gssapi/mechglue/g_inq_names.c b/src/lib/gssapi/mechglue/g_inq_names.c
index 89330e43f..971595191 100644
--- a/src/lib/gssapi/mechglue/g_inq_names.c
+++ b/src/lib/gssapi/mechglue/g_inq_names.c
@@ -1,5 +1,4 @@
-
-#ident	"@(#)g_inquire_names.c 1.1     95/12/19 SMI"
+/* #ident	"@(#)g_inquire_names.c 1.1     95/12/19 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
diff --git a/src/lib/gssapi/mechglue/g_process_context.c b/src/lib/gssapi/mechglue/g_process_context.c
index 467dbbcd2..b09b2a6f5 100644
--- a/src/lib/gssapi/mechglue/g_process_context.c
+++ b/src/lib/gssapi/mechglue/g_process_context.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_process_context.c 1.9     95/08/07 SMI"
+/* #ident  "@(#)gss_process_context.c 1.9     95/08/07 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
diff --git a/src/lib/gssapi/mechglue/g_rel_buffer.c b/src/lib/gssapi/mechglue/g_rel_buffer.c
index a9188895e..b39f3057e 100644
--- a/src/lib/gssapi/mechglue/g_rel_buffer.c
+++ b/src/lib/gssapi/mechglue/g_rel_buffer.c
@@ -1,4 +1,4 @@
-#ident  "@(#)g_rel_buffer.c 1.2     96/02/06 SMI"
+/* #ident  "@(#)g_rel_buffer.c 1.2     96/02/06 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
diff --git a/src/lib/gssapi/mechglue/g_rel_cred.c b/src/lib/gssapi/mechglue/g_rel_cred.c
index db34a4247..092492e7f 100644
--- a/src/lib/gssapi/mechglue/g_rel_cred.c
+++ b/src/lib/gssapi/mechglue/g_rel_cred.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_release_cred.c 1.15     95/08/07 SMI"
+/* #ident  "@(#)gss_release_cred.c 1.15     95/08/07 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
diff --git a/src/lib/gssapi/mechglue/g_rel_name.c b/src/lib/gssapi/mechglue/g_rel_name.c
index c53212704..101b73009 100644
--- a/src/lib/gssapi/mechglue/g_rel_name.c
+++ b/src/lib/gssapi/mechglue/g_rel_name.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_release_name.c 1.2     95/05/09 SMI"
+/* #ident  "@(#)gss_release_name.c 1.2     95/05/09 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
diff --git a/src/lib/gssapi/mechglue/g_rel_oid_set.c b/src/lib/gssapi/mechglue/g_rel_oid_set.c
index 2ffaf8c00..bbe44e598 100644
--- a/src/lib/gssapi/mechglue/g_rel_oid_set.c
+++ b/src/lib/gssapi/mechglue/g_rel_oid_set.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_release_oid_set.c 1.12     95/08/23 SMI"
+/* #ident  "@(#)gss_release_oid_set.c 1.12     95/08/23 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
diff --git a/src/lib/gssapi/mechglue/g_seal.c b/src/lib/gssapi/mechglue/g_seal.c
index 99805a422..412202dee 100644
--- a/src/lib/gssapi/mechglue/g_seal.c
+++ b/src/lib/gssapi/mechglue/g_seal.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_seal.c 1.10     95/08/07 SMI"
+/* #ident  "@(#)gss_seal.c 1.10     95/08/07 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
diff --git a/src/lib/gssapi/mechglue/g_sign.c b/src/lib/gssapi/mechglue/g_sign.c
index 5345f00be..78eee681d 100644
--- a/src/lib/gssapi/mechglue/g_sign.c
+++ b/src/lib/gssapi/mechglue/g_sign.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_sign.c 1.10     95/08/07 SMI"
+/* #ident  "@(#)gss_sign.c 1.10     95/08/07 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
diff --git a/src/lib/gssapi/mechglue/g_unseal.c b/src/lib/gssapi/mechglue/g_unseal.c
index db7b5d923..35cab05e2 100644
--- a/src/lib/gssapi/mechglue/g_unseal.c
+++ b/src/lib/gssapi/mechglue/g_unseal.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_unseal.c 1.10     95/08/07 SMI"
+/* #ident  "@(#)gss_unseal.c 1.10     95/08/07 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
diff --git a/src/lib/gssapi/mechglue/g_verify.c b/src/lib/gssapi/mechglue/g_verify.c
index c2b02a5eb..53ed26268 100644
--- a/src/lib/gssapi/mechglue/g_verify.c
+++ b/src/lib/gssapi/mechglue/g_verify.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gss_verify.c 1.9     95/08/07 SMI"
+/* #ident  "@(#)gss_verify.c 1.9     95/08/07 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
diff --git a/src/lib/gssapi/mechglue/gssd_pname_to_uid.c b/src/lib/gssapi/mechglue/gssd_pname_to_uid.c
index d3c18edaf..eb7c051ac 100644
--- a/src/lib/gssapi/mechglue/gssd_pname_to_uid.c
+++ b/src/lib/gssapi/mechglue/gssd_pname_to_uid.c
@@ -1,4 +1,4 @@
-#ident  "@(#)gssd_pname_to_uid.c 1.5     95/08/02 SMI"
+/* #ident  "@(#)gssd_pname_to_uid.c 1.5     95/08/02 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
diff --git a/src/lib/gssapi/mechglue/mechglue.h b/src/lib/gssapi/mechglue/mechglue.h
index a8c9207a1..43347a49b 100644
--- a/src/lib/gssapi/mechglue/mechglue.h
+++ b/src/lib/gssapi/mechglue/mechglue.h
@@ -1,4 +1,4 @@
-#ident  "@(#)mechglue.h 1.13     95/08/07 SMI"
+/* #ident  "@(#)mechglue.h 1.13     95/08/07 SMI" */
 
 /*
  * Copyright 1996 by Sun Microsystems, Inc.
@@ -29,8 +29,11 @@
 #ifndef _GSS_MECHGLUE_H
 #define _GSS_MECHGLUE_H
 
+#if defined(__MWERKS__) || defined(applec) || defined(THINK_C)
+#include <gssapi.h>
+#else
 #include <gssapi/gssapi.h>
-#include <sys/types.h>
+#endif
 
 /********************************************************/
 /* GSSAPI Extension functions -- these functions aren't */
diff --git a/src/lib/gssapi/mechglue/mglueP.h b/src/lib/gssapi/mechglue/mglueP.h
index df5c34507..df9802f09 100644
--- a/src/lib/gssapi/mechglue/mglueP.h
+++ b/src/lib/gssapi/mechglue/mglueP.h
@@ -1,4 +1,5 @@
-#ident  "@(#)mglueP.h 1.2     96/01/18 SMI"
+/* #ident  "@(#)mglueP.h 1.2     96/01/18 SMI" */
+
 /*
  * This header contains the private mechglue definitions.
  *