2 files changed, 6 insertions, 5 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index ae8673452a3..5c291944766 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -86,7 +86,6 @@ anymore, so they can be removed.
 AMPERSAND_FULL_NAME
 BROKEN_DATAGRAM_SOCKETS
 BROKEN_FIONREAD
-BROKEN_GETWD
 BROKEN_GET_CURRENT_DIR_NAME
 BROKEN_NON_BLOCKING_CONNECT
 BROKEN_PTY_READ_AFTER_EAGAIN
@@ -161,7 +160,6 @@ HAVE_FUTIMESAT
 HAVE_GAI_STRERROR
 HAVE_GCONF
 HAVE_GETADDRINFO
-HAVE_GETCWD
 HAVE_GETDELIM
 HAVE_GETGRENT
 HAVE_GETHOSTNAME
@@ -178,7 +176,6 @@ HAVE_GETRLIMIT
 HAVE_GETRUSAGE
 HAVE_GETSOCKNAME
 HAVE_GETTIMEOFDAY
-HAVE_GETWD
 HAVE_GET_CURRENT_DIR_NAME
 HAVE_GHOSTSCRIPT
 HAVE_GIF
@@ -304,7 +301,6 @@ HAVE_SIGNED_SIG_ATOMIC_T
 HAVE_SIGNED_WCHAR_T
 HAVE_SIGNED_WINT_T
 HAVE_SIGSET_T
-HAVE_SIZE_T
 HAVE_SNPRINTF
 HAVE_SOCKETS
 HAVE_SOUND
@@ -369,7 +365,6 @@ HAVE_TM_ZONE
 HAVE_TOUCHLOCK
 HAVE_TZNAME
 HAVE_TZSET
-HAVE_UNISTD_H
 HAVE_UNSIGNED_LONG_LONG_INT
 HAVE_UTIL_H
 HAVE_UTIMENSAT
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 3d76f9dd2ba..b256a0f5dc4 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Assume POSIX 1003.1-1988 or later for unistd.h (Bug#12945).
+        * CPP-DEFINES (BROKEN_GETWD, HAVE_GETCWD, HAVE_GETWD, HAVE_SIZE_T)
+        (HAVE_UNISTD_H): Remove.
+
 2012-11-17  Paul Eggert  <eggert@cs.ucla.edu>
 
         Assume POSIX 1003.1-1988 or later for fcntl.h (Bug#12881).