Fix a typo in a comment.

[bpt/emacs.git] / nt / ChangeLog

diff --git a/nt/ChangeLog b/nt/ChangeLog
index cb63a90..b455e66 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,26 @@
+2012-11-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Revert recent change for Bug#8855; see ../src/ChangeLog.
+
+2012-11-23  Eli Zaretskii  <eliz@gnu.org>
+
+       Fix a race condition with glib (Bug#8855).
+       This is a backport from the trunk, consisting of:
+
+       * inc/sys/wait.h: New file, with prototype of waitpid and
+       definitions of macros it needs.
+       * inc/ms-w32.h (wait): Don't define, 'wait' is not used anymore.
+       (sys_wait): Remove prototype.
+       * config.nt (HAVE_SYS_WAIT_H): Define to 1.
+
+2012-11-20  Eli Zaretskii  <eliz@gnu.org>
+
+       * nmake.defs: Use !if, not !ifdef.  See
+       http://lists.gnu.org/archive/html/help-emacs-windows/2012-11/msg00027.html
+       for the details.
+
+       * inc/stdint.h (INTPTR_MIN): Define for MSVC.
+
 2012-11-19  Eli Zaretskii  <eliz@gnu.org>
 
        * inc/stdint.h (PTRDIFF_MIN) [!__GNUC__]: Define for MSVC.
@@ -2746,7 +2769,7 @@
 ;; add-log-time-zone-rule: t
 ;; End:
 
-  Copyright (C) 1995-1999, 2001-2012  Free Software Foundation, Inc.
+  Copyright (C) 1995-1999, 2001-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.