From: Juanma Barranquero <lekktu@gmail.com>
Date: Mon, 17 Dec 2012 20:58:12 +0000 (+0100)
Subject: nt/config.nt: Sync with autogen/config.in.
X-Git-Tag: emacs-24.3.90~173^2~7^2~560
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ab1ce02438ed20db1beb722f651e97ddf31f6bf3;p=emacs.git

nt/config.nt: Sync with autogen/config.in.
(BSD4_2): Remove.
---

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 114fa826b2b..6c7b2bdfddc 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-17  Juanma Barranquero  <lekktu@gmail.com>
+
+	* config.nt: Sync with autogen/config.in.
+	(BSD4_2): Remove.
+
 2012-12-17  Eli Zaretskii  <eliz@gnu.org>
 
 	* inc/sys/acl.h: New file.
diff --git a/nt/config.nt b/nt/config.nt
index aef92a8cccd..f3e61e9427f 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -60,9 +60,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define on FreeBSD to work around an issue when reading from a PTY. */
 #undef BROKEN_PTY_READ_AFTER_EAGAIN
 
-/* Define if the system is compatible with BSD 4.2. */
-#undef BSD4_2
-
 /* Define if the system is compatible with BSD 4.2. */
 #undef BSD_SYSTEM
 
@@ -725,7 +722,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the <png.h> header file. */
 #undef HAVE_PNG_H
 
-/* Define to 1 if you have the POSIX ACL support. */
+/* Define to 1 if using POSIX ACL support. */
 #define HAVE_POSIX_ACL 1
 
 /* Define to 1 if you have the `posix_memalign' function. */