aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2012-12-17 21:58:12 +0100
committerJuanma Barranquero2012-12-17 21:58:12 +0100
commitab1ce02438ed20db1beb722f651e97ddf31f6bf3 (patch)
tree8564c050555d5ef3a681f7f53a96cad39a4019b2
parent2387610d2bf5f6da3f3f7dc9e2f86f72405be78c (diff)
downloademacs-ab1ce02438ed20db1beb722f651e97ddf31f6bf3.tar.gz
emacs-ab1ce02438ed20db1beb722f651e97ddf31f6bf3.zip
nt/config.nt: Sync with autogen/config.in.
(BSD4_2): Remove.
-rw-r--r--nt/ChangeLog5
-rw-r--r--nt/config.nt5
2 files changed, 6 insertions, 4 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 114fa826b2b..6c7b2bdfddc 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
12012-12-17 Juanma Barranquero <lekktu@gmail.com>
2
3 * config.nt: Sync with autogen/config.in.
4 (BSD4_2): Remove.
5
12012-12-17 Eli Zaretskii <eliz@gnu.org> 62012-12-17 Eli Zaretskii <eliz@gnu.org>
2 7
3 * inc/sys/acl.h: New file. 8 * 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
@@ -61,9 +61,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
61#undef BROKEN_PTY_READ_AFTER_EAGAIN 61#undef BROKEN_PTY_READ_AFTER_EAGAIN
62 62
63/* Define if the system is compatible with BSD 4.2. */ 63/* Define if the system is compatible with BSD 4.2. */
64#undef BSD4_2
65
66/* Define if the system is compatible with BSD 4.2. */
67#undef BSD_SYSTEM 64#undef BSD_SYSTEM
68 65
69/* Define if AH_BOTTOM should change BSD_SYSTEM. */ 66/* Define if AH_BOTTOM should change BSD_SYSTEM. */
@@ -725,7 +722,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
725/* Define to 1 if you have the <png.h> header file. */ 722/* Define to 1 if you have the <png.h> header file. */
726#undef HAVE_PNG_H 723#undef HAVE_PNG_H
727 724
728/* Define to 1 if you have the POSIX ACL support. */ 725/* Define to 1 if using POSIX ACL support. */
729#define HAVE_POSIX_ACL 1 726#define HAVE_POSIX_ACL 1
730 727
731/* Define to 1 if you have the `posix_memalign' function. */ 728/* Define to 1 if you have the `posix_memalign' function. */