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 99d51f42fe778622d56804189131d6d53b280e5a..6b2c80e449b7d3f72d0c2b8e77808e062afb1921 100644 (file)
--- 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 f60f20fc8898041124dfa6cb69ab15d3bf5ed994..44086f4bb49b825dfcd5505a911179a7beb7e59a 100644 (file)
--- 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 9e263d96c98bb4c576250a2c97e70f42d7d24d12..41f02136fce3c255e70be9f35ddffea9112b67ab 100644 (file)
--- 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 aea0141d15aa7e133bfaf509e4f4a7608f763cb8..eb45b4519f5f53b3944c9a3755272997c9db386a 100644 (file)
--- 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>