Merge from emacs-24; up to 2012-11-17T22:12:47Z!eggert@cs.ucla.edu

[bpt/emacs.git] / nt / ChangeLog

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 4f9e8a2..0eda3a6 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,11 @@
+2012-11-21  Eli Zaretskii  <eliz@gnu.org>
+
+       * nmake.defs: Use !if, not !ifdef.  For the details, see
+       http://lists.gnu.org/archive/html/help-emacs-windows/2012-11/msg00027.html
+
+       * inc/stdint.h (INTPTR_MIN):
+       (PTRDIFF_MIN) [!__GNUC__]: Define for MSVC.
+
 2012-11-18  Eli Zaretskii  <eliz@gnu.org>
 
        * inc/unistd.h: Don't include fcntl.h and don't define O_RDWR.