From 77f447c1b1828a1b1f4bd64ca9ebaa4713539606 Mon Sep 17 00:00:00 2001
From: Richard Basch <probe@mit.edu>
Date: Thu, 4 Jan 1996 05:41:38 +0000
Subject: [PATCH] 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
---
 src/lib/kdb4/configure.in    | 1 -
 src/lib/kdb4/krb_kdb_utils.c | 5 +----
 src/lib/krb4/configure.in    | 1 -
 src/lib/krb4/dest_tkt.c      | 5 +----
 src/lib/krb4/in_tkt.c        | 5 +----
 src/lib/krb4/put_svc_key.c   | 4 +---
 src/util/ss/configure.in     | 1 -
 src/util/ss/help.c           | 5 +----
 8 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/src/lib/kdb4/configure.in b/src/lib/kdb4/configure.in
index fe3f8e42c..9bbc1cfd6 100644
--- 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 9421b30c6..2733f491e 100644
--- 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 83eca0a5d..5a2eb94a0 100644
--- 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 67ecdbb5e..7830a859f 100644
--- 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 98ab1634c..42cfed43d 100644
--- 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 105799139..b5185911b 100644
--- 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 5254f7945..16f5b827e 100644
--- 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 3cdf82b57..e09b77715 100644
--- 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"
-- 
2.26.2