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

diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 1bbc769b949daed710f5bd5750047f97fc627e55..e2d043315083da1b450e0fee09b5367874cf45d5 100644 (file)
--- 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 09201795741f4bbbc8f26c0eb29adc5602e845ee..a715a9aa4f8e89360f6beb40f85320217b6d9445 100644 (file)
--- 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 80fd082f32f8ebdad45b6d490d40a9bb09d746b4..c0bd6fcaf339b6da769f764b280ccbb86cf3188f 100644 (file)
--- 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 **/