diff options
| author | Alexandra Ellwood <lxs@mit.edu> | 2003-03-06 20:28:57 +0000 |
|---|---|---|
| committer | Alexandra Ellwood <lxs@mit.edu> | 2003-03-06 20:28:57 +0000 |
| commit | d9e959edfa8da7cab3bde96c9c4ca39beaf8db69 (patch) | |
| tree | a836ab86dd8733c4fa09c887c4df200672ecbfe2 /src/lib | |
| parent | 0d01969ae78e834a81a2bade7e841e286cd5ef5b (diff) | |
| download | krb5-d9e959edfa8da7cab3bde96c9c4ca39beaf8db69.tar.gz krb5-d9e959edfa8da7cab3bde96c9c4ca39beaf8db69.tar.xz krb5-d9e959edfa8da7cab3bde96c9c4ca39beaf8db69.zip | |
* 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
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/gssapi/krb5/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/disp_status.c | 5 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/gssapiP_krb5.h | 5 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/gssapi_krb5.h | 13 |
4 files changed, 8 insertions, 20 deletions
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog index 7e33383ec..7424a251d 100644 --- 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 7725e4dda..0b296f6ce 100644 --- 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 3b5bf17e1..325108612 100644 --- 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 489f65434..c142802e4 100644 --- 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 |