Merge from emacs-24; up to 2014-04-16T15:28:26Z!monnier@iro.umontreal.ca

2 files changed, 7 insertions, 2 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 85c4b90d9fc..0acdeecff8f 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-16  Eli Zaretskii  <eliz@gnu.org>
+
+        * update-game-score.c (write_scores): Condition fchmod call on
+        DOS_NT, not WINDOWSNT.
+
 2014-03-22  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (etags_deps, etags_args): New, to reduce duplication.
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index ad591cca87a..cb6fdf73590 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -443,7 +443,7 @@ write_scores (const char *filename, const struct score_entry *scores,
   fd = mkostemp (tempfile, 0);
   if (fd < 0)
     return -1;
-#ifndef WINDOWSNT
+#ifndef DOS_NT
   if (fchmod (fd, 0644) != 0)
     return -1;
 #endif
@@ -459,7 +459,7 @@ write_scores (const char *filename, const struct score_entry *scores,
     return -1;
   if (rename (tempfile, filename) != 0)
     return -1;
-#ifdef WINDOWSNT
+#ifdef DOS_NT
   if (chmod (filename, 0644) < 0)
     return -1;
 #endif