* disp_status.c, gssapi_krb5.h, gssapiP_krb5.h: Removed Mac header goober

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

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 7e33383ec95fe5e0498215aa011fd5a86fed135b..7424a251db02ed7cad86cb35212d6f758e5ab2db 100644 (file)
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-06  Alexandra Ellwood  <lxs@mit.edu>
+
+    * disp_status.c, gssapi_krb5.h, gssapiP_krb5.h: 
+    Removed Mac header goober.
+
 2003-03-05  Tom Yu  <tlyu@mit.edu>
 
        * acquire_cred.c (krb5_gss_register_acceptor_identity): New

diff --git a/src/lib/gssapi/krb5/disp_status.c b/src/lib/gssapi/krb5/disp_status.c
index 7725e4ddae44ba52625b3303b588d0df23244c96..0b296f6ce6be3c0dfaf0cfc590f1203cf3f69e5d 100644 (file)
--- a/src/lib/gssapi/krb5/disp_status.c
+++ b/src/lib/gssapi/krb5/disp_status.c
@@ -21,12 +21,7 @@
  */
 
 #include "gssapiP_krb5.h"
-
-#if TARGET_OS_MAC
-#include <Kerberos/com_err.h>
-#else
 #include "com_err.h"
-#endif
 
 /* XXXX internationalization!! */
 

diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h
index 3b5bf17e18e0856febe33725ea1a259151f87251..3251086128a0067fcbbe33a16bcd07357c6d1675 100644 (file)
--- a/src/lib/gssapi/krb5/gssapiP_krb5.h
+++ b/src/lib/gssapi/krb5/gssapiP_krb5.h
@@ -47,11 +47,8 @@
 #ifndef _GSSAPIP_KRB5_H_
 #define _GSSAPIP_KRB5_H_
 
-#if TARGET_OS_MAC
-#include <Kerberos/krb5.h>
-#else
 #include <krb5.h>
-#endif
+
 #ifdef HAVE_MEMORY_H
 #include <memory.h>
 #endif

diff --git a/src/lib/gssapi/krb5/gssapi_krb5.h b/src/lib/gssapi/krb5/gssapi_krb5.h
index 489f65434a7a9aeda19dcf53f97b78d762f6d3b8..c142802e4a161fa556e14cce272a77dff89b9c30 100644 (file)
--- a/src/lib/gssapi/krb5/gssapi_krb5.h
+++ b/src/lib/gssapi/krb5/gssapi_krb5.h
@@ -23,17 +23,8 @@
 #ifndef _GSSAPI_KRB5_H_
 #define _GSSAPI_KRB5_H_
 
-#if defined(macintosh) || (defined(__MACH__) && defined(__APPLE__))
-#      include <TargetConditionals.h>
-#endif
-
-#if TARGET_OS_MAC
-#      include <Kerberos/krb5.h>
-#      include <Kerberos/gssapi.h>
-#      include <Kerberos/gssapi_generic.h>
-#else
-#      include <krb5.h>
-#endif
+#include <gssapi/gssapi.h>
+#include <krb5.h>
 
 /* C++ friendlyness */
 #ifdef __cplusplus