summaryrefslogtreecommitdiffstats
path: root/src/lib/gssapi/generic
diff options
context:
space:
mode:
authorKeith Vetter <keithv@fusion.com>1995-09-11 19:06:45 +0000
committerKeith Vetter <keithv@fusion.com>1995-09-11 19:06:45 +0000
commitcdd6c33b9ae48076999e33ffa70e2365ecc5eb8c (patch)
tree84682f14e77a844dfab2174318ebccb9067c829f /src/lib/gssapi/generic
parenta66029e852781fa0333dc92bd88bd8184f6feeb1 (diff)
downloadkrb5-cdd6c33b9ae48076999e33ffa70e2365ecc5eb8c.tar.gz
krb5-cdd6c33b9ae48076999e33ffa70e2365ecc5eb8c.tar.xz
krb5-cdd6c33b9ae48076999e33ffa70e2365ecc5eb8c.zip
Mac Beta 1 submission
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6749 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/gssapi/generic')
-rw-r--r--src/lib/gssapi/generic/ChangeLog7
-rw-r--r--src/lib/gssapi/generic/gssapiP_generic.h2
-rw-r--r--src/lib/gssapi/generic/gssapi_generic.h4
-rw-r--r--src/lib/gssapi/generic/util_canonhost.c2
-rw-r--r--src/lib/gssapi/generic/utl_nohash_validate.c2
5 files changed, 17 insertions, 0 deletions
diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 89f798626..07a00ad8b 100644
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,10 @@
+Wed Sep 6 12:00:00 1995 James Mattly <mattly@fusion.com>
+ * gssapiP_generic.h: changed a path bearing include for MACINTOSH
+ * gssapi_generic.h: changed a path bearing include for MACINTOSH
+ * util_cannonhost.h: changed a path bearing include for MACINTOSH
+ * utl_nohash_validate.h: changed a path bearing include for MACINTOSH,
+ also we don't have limits.h
+
Thu Aug 31 11:43:59 EDT 1995 Paul Park (pjpark@mit.edu)
* gssapi.h - Update to V2 API. Also use autoconf.h if USE_AUTOCONF_H
diff --git a/src/lib/gssapi/generic/gssapiP_generic.h b/src/lib/gssapi/generic/gssapiP_generic.h
index ab7eddf97..80fd082f3 100644
--- a/src/lib/gssapi/generic/gssapiP_generic.h
+++ b/src/lib/gssapi/generic/gssapiP_generic.h
@@ -28,7 +28,9 @@
#include "gssapi_err_generic.h"
#include <errno.h>
+#ifndef _MACINTOSH
#include <sys/types.h>
+#endif
/** helper macros **/
diff --git a/src/lib/gssapi/generic/gssapi_generic.h b/src/lib/gssapi/generic/gssapi_generic.h
index 9073840de..462414de6 100644
--- a/src/lib/gssapi/generic/gssapi_generic.h
+++ b/src/lib/gssapi/generic/gssapi_generic.h
@@ -23,7 +23,11 @@
#ifndef _GSSAPI_GENERIC_H_
#define _GSSAPI_GENERIC_H_
+#ifndef _MACINTOSH
#include <gssapi/gssapi.h>
+#else
+#include <gssapi.h>
+#endif
extern const gss_OID_desc FAR * const gss_nt_user_name;
extern const gss_OID_desc FAR * const gss_nt_machine_uid_name;
diff --git a/src/lib/gssapi/generic/util_canonhost.c b/src/lib/gssapi/generic/util_canonhost.c
index 712d0ee07..896b950b1 100644
--- a/src/lib/gssapi/generic/util_canonhost.c
+++ b/src/lib/gssapi/generic/util_canonhost.c
@@ -24,7 +24,9 @@
#define NEED_SOCKETS
#include "gssapiP_generic.h"
+#ifndef _MACINTOSH
#include <sys/types.h>
+#endif
#include <ctype.h>
#include <string.h>
diff --git a/src/lib/gssapi/generic/utl_nohash_validate.c b/src/lib/gssapi/generic/utl_nohash_validate.c
index eaa83d34d..4cd94cafd 100644
--- a/src/lib/gssapi/generic/utl_nohash_validate.c
+++ b/src/lib/gssapi/generic/utl_nohash_validate.c
@@ -26,8 +26,10 @@
#include "gssapiP_generic.h"
+#ifndef _MACINTOSH
#include <sys/types.h>
#include <limits.h>
+#endif
/* functions for each type */