diff options
| author | Paul Eggert <[email protected]> | 2014-04-16 12:43:46 -0700 |
|---|---|---|
| committer | Paul Eggert <[email protected]> | 2014-04-16 12:43:46 -0700 |
| commit | 290d7ac277986bd118e594a8100b3f40e4492cb1 (patch) | |
| tree | d63a3aa61cac577dd119665edaffe2def8d194e2 /lib-src | |
| parent | 37eccff4f72c5a36dcd4b89d417b0047aab84e50 (diff) | |
| parent | b262bde327db2cd9b2f01f2d3ed946d0b188cb9d (diff) | |
Merge from emacs-24; up to 2014-04-16T15:28:[email protected]
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/update-game-score.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 85c4b90d9f..0acdeecff8 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2014-04-16 Eli Zaretskii <[email protected]> + + * update-game-score.c (write_scores): Condition fchmod call on + DOS_NT, not WINDOWSNT. + 2014-03-22 Glenn Morris <[email protected]> * 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 ad591cca87..cb6fdf7359 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 |