* disp_com_err_status.c, gssapi_generic.h: Removed Mac header goober. * gssapiP_generic.h, gssapi.hin: Removed macintosh check because we don't build on OS 9 anymore. * gssapi.hin: Removed enumsalwaysint because there are no typed enums in this header. Removed duplicate CFM-68K magic

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

5 files changed, 12 insertions, 19 deletions

diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 3eb27c5fd..bd58e5ae7 100644
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,14 @@
+2003-03-06  Alexandra Ellwood  <lxs@mit.edu>
+
+    * disp_com_err_status.c, gssapi_generic.h:  
+    Removed Mac header goober.
+    
+    * gssapiP_generic.h, gssapi.hin: Removed macintosh check because 
+    we don't build on OS 9 anymore.
+    
+    * gssapi.hin: Removed enumsalwaysint because there are no typed
+    enums in this header.  Removed duplicate CFM-68K magic.  
+
 2003-02-12  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in: Remove stamp rules.  Explicitly creates header
diff --git a/src/lib/gssapi/generic/disp_com_err_status.c b/src/lib/gssapi/generic/disp_com_err_status.c
index 71c75056e..c4db91375 100644
--- a/src/lib/gssapi/generic/disp_com_err_status.c
+++ b/src/lib/gssapi/generic/disp_com_err_status.c
@@ -25,12 +25,7 @@
  */
 
 #include "gssapiP_generic.h"
-
-#if TARGET_OS_MAC
-#include <Kerberos/com_err.h>
-#else
 #include "com_err.h"
-#endif
 
 /* XXXX internationalization!! */
 
diff --git a/src/lib/gssapi/generic/gssapi.hin b/src/lib/gssapi/generic/gssapi.hin
index 94c5cb186..35519ed48 100644
--- a/src/lib/gssapi/generic/gssapi.hin
+++ b/src/lib/gssapi/generic/gssapi.hin
@@ -41,7 +41,6 @@ extern "C" {
 #if TARGET_OS_MAC
 #	if defined(__MWERKS__)
 #		pragma import on
-#		pragma enumsalwaysint on
 #	endif
 #	pragma options align=mac68k
 #endif
@@ -69,9 +68,7 @@ extern "C" {
 /*
  * POSIX says that sys/types.h is where size_t is defined.
  */
-#ifndef macintosh
 #include <sys/types.h>
-#endif
 
 /*
  * If the platform supports the xom.h header file, it should be included here.
@@ -784,7 +781,6 @@ OM_uint32 KRB5_CALLCONV gss_canonicalize_name
 
 #if TARGET_OS_MAC
 #  if defined(__MWERKS__)
-#    pragma enumsalwaysint reset
 #    pragma import reset
 #  endif
 #  pragma options align=reset
@@ -806,9 +802,4 @@ OM_uint32 KRB5_CALLCONV gss_canonicalize_name
 /* XXXX This is a necessary evil until the spec is fixed */
 #define GSS_S_CRED_UNAVAIL GSS_S_FAILURE
 
-/* Macintoh CFM-68K magic incantation */
-#if defined(macintosh) && defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__)
-#pragma import reset
-#endif
-
 #endif /* _GSSAPI_H_ */
diff --git a/src/lib/gssapi/generic/gssapiP_generic.h b/src/lib/gssapi/generic/gssapiP_generic.h
index 529fe4ddb..102ba699e 100644
--- a/src/lib/gssapi/generic/gssapiP_generic.h
+++ b/src/lib/gssapi/generic/gssapiP_generic.h
@@ -27,7 +27,7 @@
  * $Id$
  */
 
-#if (defined(_WIN32) || defined(macintosh))
+#if defined(_WIN32)
 #include "k5-int.h"
 #else
 #ifdef HAVE_STDLIB_H
diff --git a/src/lib/gssapi/generic/gssapi_generic.h b/src/lib/gssapi/generic/gssapi_generic.h
index d8c7ec66a..bf3c2af59 100644
--- a/src/lib/gssapi/generic/gssapi_generic.h
+++ b/src/lib/gssapi/generic/gssapi_generic.h
@@ -27,11 +27,7 @@
  * $Id$
  */
 
-#if defined(macintosh) || (defined(__MACH__) && defined(__APPLE__))
-#include <Kerberos/gssapi.h>
-#else
 #include <gssapi/gssapi.h>
-#endif
 
 #if defined(__cplusplus) && !defined(GSSAPIGENERIC_BEGIN_DECLS)
 #define GSSAPIGENERIC_BEGIN_DECLS	extern "C" {