From: Keith Vetter <keithv@fusion.com>
Date: Wed, 8 Nov 1995 01:09:26 +0000 (+0000)
Subject: Fix build problem on Mac caused by multiple definitions of stat
X-Git-Tag: krb5-1.0-beta6~849
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c497df864f472079e0e8dbed2049225ac48b5f0c;p=krb5.git

Fix build problem on Mac caused by multiple definitions of stat
function.

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

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 598c1d3c8..c04fdf6ea 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,9 @@
+Tue Nov 7 12:00:00 1995  John Rivlin <jrivlin@fusion.com>
+
+	* k5-int.h: Place stat declation inside #ifndef __MWERKS__ so
+		as not to conflict with the definition in the 
+		MetroWerks compiler.
+
 Tue Oct 24 17:31:36 1995  Theodore Y. Ts'o  <tytso@dcl>
 
 	* k5-int.h: Manually defined PROVIDE_* for Macintosh and MS-DOS so
diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 739bd9f9e..14cf58747 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -231,6 +231,7 @@ typedef short			nlink_t;
 typedef unsigned long	uid_t;
 typedef unsigned long	gid_t;
 typedef long			off_t;
+
 #ifndef __MWERKS__
 struct stat
 {
@@ -248,9 +249,10 @@ struct stat
 	long		st_blksize;		/* Optimal blocksize */
 	long		st_blocks;		/* blocks allocated for file */
 };
-#endif
 
 int stat(const char *path, struct stat *buf);
+#endif
+
 int fstat(int fildes, struct stat *buf);
 
 #define EFBIG 1000