From: Theodore Tso <tytso@mit.edu>
Date: Mon, 31 Oct 1994 22:06:01 +0000 (+0000)
Subject: Back out POSIX_FILE_LOCKS change.  (Should be depending on autoconf.h
X-Git-Tag: krb5-1.0-beta5~1047
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e650371a292ac4c39479ab95500d18d5222273b6;p=krb5.git

Back out POSIX_FILE_LOCKS change.  (Should be depending on autoconf.h
to supply this #define if necessary.)

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

diff --git a/src/lib/krb5/ccache/file/ChangeLog b/src/lib/krb5/ccache/file/ChangeLog
index 99d51f42f..6b2c80e44 100644
--- a/src/lib/krb5/ccache/file/ChangeLog
+++ b/src/lib/krb5/ccache/file/ChangeLog
@@ -1,3 +1,9 @@
+Mon Oct 31 17:02:04 1994  Theodore Y. Ts'o  (tytso@dcl)
+
+	* fcc_maybe.c: Back out POSIX_FILE_LOCKS change.  (Should be
+		depending on autoconf.h to supply this #define if
+		necessary.) 
+
 Thu Oct 13 17:23:42 1994  Theodore Y. Ts'o  (tytso@maytag)
 
 	* configure.in: Add ISODE_DEFS
diff --git a/src/lib/krb5/ccache/file/fcc_maybe.c b/src/lib/krb5/ccache/file/fcc_maybe.c
index f60f20fc8..44086f4bb 100644
--- a/src/lib/krb5/ccache/file/fcc_maybe.c
+++ b/src/lib/krb5/ccache/file/fcc_maybe.c
@@ -44,12 +44,6 @@ int krb5_fcc_default_format = KRB5_FCC_DEFAULT_FVNO;
 #include <krb5/los-proto.h>
 #include <stdio.h>
 
-#ifdef _POSIX_VERSION
- /* Is there a better way to decide whether or not we should use flock */
- /* vs. fcntl.  Example: broken SunOS tmpfs.... */
-#define POSIX_FILE_LOCKS
-#endif
-
 #ifdef POSIX_FILE_LOCKS
 #ifndef unicos61
 #include <fcntl.h>
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 9e263d96c..41f02136f 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,9 @@
+Mon Oct 31 17:04:08 1994  Theodore Y. Ts'o  (tytso@dcl)
+
+	* lock_file.c: Back out POSIX_FILE_LOCKS change.  (Should be
+		depending on autoconf.h to supply this #define if
+		necessary.) 
+
 Thu Oct 13 17:24:31 1994  Theodore Y. Ts'o  (tytso@maytag)
 
 	* configure.in: Add ISODE_DEFS
diff --git a/src/lib/krb5/os/lock_file.c b/src/lib/krb5/os/lock_file.c
index aea0141d1..eb45b4519 100644
--- a/src/lib/krb5/os/lock_file.c
+++ b/src/lib/krb5/os/lock_file.c
@@ -34,13 +34,6 @@
 
 #include <stdio.h>
 
-#ifdef _POSIX_VERSION
- /* Is there a better way to decide whether or not we should use flock */
- /* vs. fcntl.  Example: broken SunOS tmpfs.... */
-#define POSIX_FILE_LOCKS
-#endif
-
-
 #ifdef POSIX_FILE_LOCKS
 #include <errno.h>
 #include <fcntl.h>