Module Name: src
Committed By: kamil
Date: Thu Jun 22 23:37:00 UTC 2017
Modified Files:
src/bin/ksh: config.h sh.h
Log Message:
ksh: Drop support for systems without <fcntl.h>
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/bin/ksh/config.h
cvs rdiff -u -r1.21 -r1.22 src/bin/ksh/sh.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ksh/config.h
diff -u src/bin/ksh/config.h:1.27 src/bin/ksh/config.h:1.28
--- src/bin/ksh/config.h:1.27 Thu Jun 22 23:33:36 2017
+++ src/bin/ksh/config.h Thu Jun 22 23:37:00 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: config.h,v 1.27 2017/06/22 23:33:36 kamil Exp $ */
+/* $NetBSD: config.h,v 1.28 2017/06/22 23:37:00 kamil Exp $ */
/* config.h. Generated automatically by configure. */
/* config.h.in. Generated automatically from configure.in by autoheader. */
@@ -259,9 +259,6 @@
/* Define if you have the <dirent.h> header file. */
#define HAVE_DIRENT_H 1
-/* Define if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
/* Define if you have the <limits.h> header file. */
#define HAVE_LIMITS_H 1
Index: src/bin/ksh/sh.h
diff -u src/bin/ksh/sh.h:1.21 src/bin/ksh/sh.h:1.22
--- src/bin/ksh/sh.h:1.21 Thu Jun 22 23:33:36 2017
+++ src/bin/ksh/sh.h Thu Jun 22 23:37:00 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: sh.h,v 1.21 2017/06/22 23:33:36 kamil Exp $ */
+/* $NetBSD: sh.h,v 1.22 2017/06/22 23:37:00 kamil Exp $ */
/*
* Public Domain Bourne/Korn shell
*/
-/* $Id: sh.h,v 1.21 2017/06/22 23:33:36 kamil Exp $ */
+/* $Id: sh.h,v 1.22 2017/06/22 23:37:00 kamil Exp $ */
#include "config.h" /* system and option configuration info */
@@ -33,12 +33,8 @@
#endif /* HAVE_PROTOTYPES */
#include <errno.h>
+#include <fcntl.h>
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#else
-# include <sys/file.h>
-#endif /* HAVE_FCNTL_H */
#ifndef O_ACCMODE
# define O_ACCMODE (O_RDONLY|O_WRONLY|O_RDWR)
#endif /* !O_ACCMODE */
