From e0ecd728fbf5551cdb076b73a2a1256b85f0017b Mon Sep 17 00:00:00 2001
From: Richard Basch <probe@mit.edu>
Date: Thu, 4 Jan 1996 05:39:37 +0000
Subject: [PATCH] Removed sys/fcntl.h checking (always use fcntl.h instead)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7268 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/appl/movemail/configure.in    | 1 -
 src/appl/movemail/movemail.c      | 5 ++---
 src/appl/popper/configure.in      | 1 -
 src/appl/popper/pop_xmit.c        | 4 +---
 src/include/k5-int.h              | 6 ------
 src/kadmin.v4/server/acl_files.c  | 4 +---
 src/kadmin.v4/server/configure.in | 1 -
 src/kadmin.v4/server/kadm_funcs.c | 4 +---
 8 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/src/appl/movemail/configure.in b/src/appl/movemail/configure.in
index c23366526..19711245a 100644
--- a/src/appl/movemail/configure.in
+++ b/src/appl/movemail/configure.in
@@ -1,7 +1,6 @@
 AC_INIT(movemail.c)
 CONFIG_RULES
 AC_PROG_INSTALL
-CHECK_FCNTL
 AC_HAVE_HEADERS(stdlib.h string.h unistd.h)
 KRB5_LIBRARIES
 V5_USE_SHARED_LIB
diff --git a/src/appl/movemail/movemail.c b/src/appl/movemail/movemail.c
index 7a3d4bfe5..a0bf68217 100644
--- a/src/appl/movemail/movemail.c
+++ b/src/appl/movemail/movemail.c
@@ -55,9 +55,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <errno.h>
-#ifdef NEED_SYS_FCNTL_H
-#include <sys/fcntl.h>
-#endif
+#include <fcntl.h>
+
 #define NO_SHORTNAMES   /* Tell config not to load remap.h */
 /* #include "../src/config.h" */
 
diff --git a/src/appl/popper/configure.in b/src/appl/popper/configure.in
index 4903e8ea5..a69a6297e 100644
--- a/src/appl/popper/configure.in
+++ b/src/appl/popper/configure.in
@@ -4,7 +4,6 @@ AC_PROG_INSTALL
 AC_FUNC_CHECK(vsprintf,AC_DEFINE(HAS_VSPRINTF))
 AC_CHECK_LIB(BSD,main)
 CHECK_WAIT_TYPE
-CHECK_FCNTL
 KRB5_POSIX_LOCKS
 
 AC_HAVE_HEADERS(strings.h)
diff --git a/src/appl/popper/pop_xmit.c b/src/appl/popper/pop_xmit.c
index 9f59f7080..ae3898f91 100644
--- a/src/appl/popper/pop_xmit.c
+++ b/src/appl/popper/pop_xmit.c
@@ -13,9 +13,7 @@ static char copyright[] = "Copyright (c) 1990 Regents of the University of Calif
 #include <sys/types.h>
 #include <sys/file.h>
 #include <sys/wait.h>
-#ifdef NEED_SYS_FCNTL_H
-#include <sys/fcntl.h>
-#endif
+#include <fcntl.h>
 #ifdef HAS_PATHS_H
 #include <paths.h>
 #endif
diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index ce2033613..24cec4fa9 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -209,7 +209,6 @@ typedef unsigned int size_t;
 
 #if defined(_MACINTOSH)
 
-
 #ifdef NEED_LOWLEVEL_IO
 #include <fcntl.h>
 #endif
@@ -633,12 +632,7 @@ extern char *strdup KRB5_PROTOTYPE((const char *));
 					   friends */
 #endif
 
-#if defined(SYSV) || defined(_AIX)
 #include <fcntl.h>
-#endif
-#ifdef NEED_SYS_FCNTL_H
-#include <sys/fcntl.h>
-#endif
 
 #endif /* KRB5_SYSINCL__ */
 /*
diff --git a/src/kadmin.v4/server/acl_files.c b/src/kadmin.v4/server/acl_files.c
index 975e79f2c..ae3b0c6bf 100644
--- a/src/kadmin.v4/server/acl_files.c
+++ b/src/kadmin.v4/server/acl_files.c
@@ -21,9 +21,7 @@
 #include <sys/stat.h>
 #include <sys/errno.h>
 #include <ctype.h>
-#ifdef NEED_SYS_FCNTL_H
-#include <sys/fcntl.h>
-#endif
+#include <fcntl.h>
 #include "krb.h"
 
 #ifndef KRB_REALM
diff --git a/src/kadmin.v4/server/configure.in b/src/kadmin.v4/server/configure.in
index 47fffc7df..7996affee 100644
--- a/src/kadmin.v4/server/configure.in
+++ b/src/kadmin.v4/server/configure.in
@@ -10,7 +10,6 @@ AC_TIME_WITH_SYS_TIME
 AC_CHECK_HEADERS(sys/time.h)
 AC_HEADER_CHECK(stdlib.h,AC_DEFINE(HAS_STDLIB_H))
 CHECK_WAIT_TYPE
-CHECK_FCNTL
 CHECK_SIGNALS
 ET_RULES
 USE_KDB5_LIBRARY
diff --git a/src/kadmin.v4/server/kadm_funcs.c b/src/kadmin.v4/server/kadm_funcs.c
index b6706194a..ae557627a 100644
--- a/src/kadmin.v4/server/kadm_funcs.c
+++ b/src/kadmin.v4/server/kadm_funcs.c
@@ -27,9 +27,7 @@ the actual database manipulation code
 #include <kadm_err.h>
 #include <krb_db.h>
 #include <syslog.h>
-#ifdef NEED_SYS_FCNTL_H
-#include <sys/fcntl.h>
-#endif
+#include <fcntl.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #ifdef TIME_WITH_SYS_TIME
-- 
2.26.2