summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheodore Tso <tytso@mit.edu>1996-01-05 02:35:16 +0000
committerTheodore Tso <tytso@mit.edu>1996-01-05 02:35:16 +0000
commit7b8ba18ace26afb5da1a1edec4f5d692058206a5 (patch)
tree48a30b12a983ac6759c4c6a928f2a8c16a8c3656
parentd21cb5558df6173cff1111d93dce480cd3c7e88c (diff)
downloadkrb5-7b8ba18ace26afb5da1a1edec4f5d692058206a5.tar.gz
krb5-7b8ba18ace26afb5da1a1edec4f5d692058206a5.tar.xz
krb5-7b8ba18ace26afb5da1a1edec4f5d692058206a5.zip
gssapiP_generic.h: Don't include <sys/types.h> since it's already
included by gssapi.h. gssapi.h: Add a #ifndef _MACINTOSH around include of <sys/types.h> git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7275 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/lib/gssapi/generic/ChangeLog7
-rw-r--r--src/lib/gssapi/generic/gssapi.h2
-rw-r--r--src/lib/gssapi/generic/gssapiP_generic.h3
3 files changed, 9 insertions, 3 deletions
diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 1bbc769b94..e2d0433150 100644
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,10 @@
+Thu Jan 4 21:33:38 1996 Theodore Y. Ts'o <tytso@dcl>
+
+ * gssapiP_generic.h: Don't include <sys/types.h> since it's
+ already included by gssapi.h.
+
+ * gssapi.h: Add a #ifndef _MACINTOSH around include of <sys/types.h>
+
Fri Nov 17 22:21:58 1995 <tytso@rsts-11.mit.edu>
* Makefile.in, ChangeLog: Add support to compile shared libraries.
diff --git a/src/lib/gssapi/generic/gssapi.h b/src/lib/gssapi/generic/gssapi.h
index 0920179574..a715a9aa4f 100644
--- a/src/lib/gssapi/generic/gssapi.h
+++ b/src/lib/gssapi/generic/gssapi.h
@@ -95,7 +95,9 @@
/*
* 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.
diff --git a/src/lib/gssapi/generic/gssapiP_generic.h b/src/lib/gssapi/generic/gssapiP_generic.h
index 80fd082f32..c0bd6fcaf3 100644
--- a/src/lib/gssapi/generic/gssapiP_generic.h
+++ b/src/lib/gssapi/generic/gssapiP_generic.h
@@ -28,9 +28,6 @@
#include "gssapi_err_generic.h"
#include <errno.h>
-#ifndef _MACINTOSH
-#include <sys/types.h>
-#endif
/** helper macros **/