Always include <fcntl.h> instead of checking for <sys/fcntl.h>

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

diff --git a/src/lib/kdb4/configure.in b/src/lib/kdb4/configure.in
index fe3f8e42c9d46dd9ee0768aae31e7d7eb26eaa40..9bbc1cfd651891680a248d53f502589131469634 100644 (file)
--- a/src/lib/kdb4/configure.in
+++ b/src/lib/kdb4/configure.in
@@ -6,7 +6,6 @@ AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_HEADER_CHECK(ndbm.h,AC_DEFINE(NDBM))
 AC_CONST
-CHECK_FCNTL
 KRB5_POSIX_LOCKS
 AC_HEADER_CHECK(unistd.h,AC_DEFINE(HAS_UNISTD_H))
 ET_RULES

diff --git a/src/lib/kdb4/krb_kdb_utils.c b/src/lib/kdb4/krb_kdb_utils.c
index 9421b30c6aaa3126ebfbba3805afd29e54e49154..2733f491e1305934c0706b3eedaad4d62a5405c0 100644 (file)
--- a/src/lib/kdb4/krb_kdb_utils.c
+++ b/src/lib/kdb4/krb_kdb_utils.c
@@ -20,10 +20,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/file.h>
-#ifdef NEED_SYS_FCNTL_H
-/* just for O_* for sco */
-#include <sys/fcntl.h>
-#endif
+#include <fcntl.h>     /* just for O_* for sco */
 
 long kdb_get_master_key_from(prompt, master_key, master_key_sched, verify,
                             kfilename)

diff --git a/src/lib/krb4/configure.in b/src/lib/krb4/configure.in
index 83eca0a5dfa2c2c40b7cf32a45278d0a751af594..5a2eb94a042d5617831d7519e95d806ed5d0affd 100644 (file)
--- a/src/lib/krb4/configure.in
+++ b/src/lib/krb4/configure.in
@@ -5,7 +5,6 @@ AC_PROG_ARCHIVE_ADD
 AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_CONST
-CHECK_FCNTL
 KRB5_POSIX_LOCKS
 AC_HEADER_CHECK(unistd.h,AC_DEFINE(HAS_UNISTD_H))
 AC_CHECK_HEADERS(sys/select.h time.h)

diff --git a/src/lib/krb4/dest_tkt.c b/src/lib/krb4/dest_tkt.c
index 67ecdbb5e97cd7b6ff604dd967cdaa868f9f9f6b..7830a859fa853f0a633b89d856883d035b86a3da 100644 (file)
--- a/src/lib/krb4/dest_tkt.c
+++ b/src/lib/krb4/dest_tkt.c
@@ -17,10 +17,7 @@
 #include <sys/param.h>
 #endif
 #include <errno.h>
-#ifdef NEED_SYS_FCNTL_H
-/* for sconix, to get O_RDWR */
-#include <sys/fcntl.h>
-#endif
+#include <fcntl.h>
 
 #ifndef O_SYNC
 #define O_SYNC 0

diff --git a/src/lib/krb4/in_tkt.c b/src/lib/krb4/in_tkt.c
index 98ab1634c147d4641e5becab919a4d997d0f2ba7..42cfed43d9a41ea19938147ccdd4effefc6d550f 100644 (file)
--- a/src/lib/krb4/in_tkt.c
+++ b/src/lib/krb4/in_tkt.c
@@ -13,10 +13,7 @@
 #include <string.h>
 #include "krb.h"
 #include <sys/file.h>
-#ifdef NEED_SYS_FCNTL_H
-/* just for O_RDWR for sco */
-#include <sys/fcntl.h>
-#endif
+#include <fcntl.h>
 #include <sys/stat.h>
 #ifdef TKT_SHMEM
 #include <sys/param.h>

diff --git a/src/lib/krb4/put_svc_key.c b/src/lib/krb4/put_svc_key.c
index 105799139e8f4df5ae10c277a122c2a17a6539d4..b5185911b93ee6682183c29830c9a9cb6af4e974 100644 (file)
--- a/src/lib/krb4/put_svc_key.c
+++ b/src/lib/krb4/put_svc_key.c
@@ -26,9 +26,7 @@
 #include <string.h>
 #include <sys/file.h>
 #include <stdio.h>
-#ifdef NEED_SYS_FCNTL_H
-#include <sys/fcntl.h>
-#endif
+#include <fcntl.h>
 #ifdef HAS_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/src/util/ss/configure.in b/src/util/ss/configure.in
index 5254f7945bbcdf9b125f3a8f25f67b5242979e1f..16f5b827e78208103bd39a152267c5a6f6db0c1f 100644 (file)
--- a/src/util/ss/configure.in
+++ b/src/util/ss/configure.in
@@ -11,7 +11,6 @@ AC_FUNC_CHECK(strdup,AC_DEFINE(HAS_STRDUP))
 ET_RULES
 SS_RULES
 CHECK_DIRENT
-CHECK_FCNTL
 CHECK_WAIT_TYPE
 CHECK_SIGNALS
 CHECK_SIGPROCMASK

diff --git a/src/util/ss/help.c b/src/util/ss/help.c
index 3cdf82b5756f6f67e39d119c152f1e650b256e99..e09b7771589bdbd5b53787bb10c4c9e2d5a0c545 100644 (file)
--- a/src/util/ss/help.c
+++ b/src/util/ss/help.c
@@ -7,10 +7,7 @@
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/file.h>
-#ifdef NEED_SYS_FCNTL_H
-/* just for O_* */
-#include <sys/fcntl.h>
-#endif
+#include <fcntl.h>     /* just for O_* */
 #include <sys/wait.h>
 #include "ss_internal.h"
 #include "copyright.h"