2 files changed, 14 insertions, 1 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 718f0a81734..07ce4d434ed 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-10  Juanma Barranquero  <lekktu@gmail.com>
+
+        * config.nt: Sync with autogen/config.in.
+
 2012-07-09  Paul Eggert  <eggert@cs.ucla.edu>
 
         * config.nt (ATTRIBUTE_CONST): Add, to sync with configure.ac.
diff --git a/nt/config.nt b/nt/config.nt
index d873ae7a57d..c43feeabd38 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -71,6 +71,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if using 'alloca.c'. */
 #undef C_ALLOCA
 
+/* Extra bits to be or'd in with any pointers stored in a Lisp_Object. */
+#undef DATA_SEG_BITS
+
+/* Address of the start of the data segment. */
+#undef DATA_START
+
 /* Define to 1 for DGUX with <sys/dg_sys_info.h>. */
 #undef DGUX
 
@@ -1097,10 +1103,13 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* Number of chars of output in the buffer of a stdio stream. */
+#undef PENDING_OUTPUT_COUNT
+
 /* Define to empty to suppress deprecation warnings when building with
    --enable-gcc-warnings and with libpng versions before 1.5, which lack
    png_longjmp. */
-#undef PNG_DEPRECATED
+#undef PNG_DEPSTRUCT
 
 /* Define to 1 if pthread_sigmask(), when it fails, returns -1 and sets errno.
    */