Merge from origin/emacs-24

[gnu-emacs] / nt / ChangeLog

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 2467e64bbef06f136392124318ced26d829efad8..693b7adc711ae250e1bda2a1bc5ce42fc1bcc815 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -815,7 +815,7 @@
 2012-10-01  Eli Zaretskii  <eliz@gnu.org>
 
        * preprep.c (RVA_TO_PTR): Use 'unsigned char *' instead of
-       'void *', for pointer arithmetics.
+       'void *', for pointer arithmetic.
        (OFFSET_TO_RVA, RVA_TO_OFFSET, RVA_TO_SECTION_OFFSET): Enclose all
        macro arguments in parentheses.