diff options
| author | Joakim Verona | 2012-12-24 17:06:23 +0100 |
|---|---|---|
| committer | Joakim Verona | 2012-12-24 17:06:23 +0100 |
| commit | 76dff48019264cd987305bb946fef16880132a7a (patch) | |
| tree | 35e38ce93ad70241e568ebc635c651456f492538 | |
| parent | 1704d0c9a2aad27a52ff39e954c42a7dec41e462 (diff) | |
| parent | c1860cdc02404d84e7f29d206b799031190a794e (diff) | |
| download | emacs-76dff48019264cd987305bb946fef16880132a7a.tar.gz emacs-76dff48019264cd987305bb946fef16880132a7a.zip | |
auto upstream
| -rw-r--r-- | nt/ChangeLog | 6 | ||||
| -rw-r--r-- | nt/inc/sys/stat.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 6c7b2bdfddc..16c96d4e9ce 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2012-12-24 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * inc/sys/stat.h (S_ISMPX): Define to zero, to accommodate changes | ||
| 4 | in lib/filemode.c that broke the MS-Windows build. | ||
| 5 | Suggested by Andy Moreton <andrewjmoreton@gmail.com>. | ||
| 6 | |||
| 1 | 2012-12-17 Juanma Barranquero <lekktu@gmail.com> | 7 | 2012-12-17 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 8 | ||
| 3 | * config.nt: Sync with autogen/config.in. | 9 | * config.nt: Sync with autogen/config.in. |
diff --git a/nt/inc/sys/stat.h b/nt/inc/sys/stat.h index fb56b7cab40..78be6eb57b1 100644 --- a/nt/inc/sys/stat.h +++ b/nt/inc/sys/stat.h | |||
| @@ -74,6 +74,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 74 | #define S_ISDOOR(m) 0 | 74 | #define S_ISDOOR(m) 0 |
| 75 | #define S_ISMPB(m) 0 | 75 | #define S_ISMPB(m) 0 |
| 76 | #define S_ISMPC(m) 0 | 76 | #define S_ISMPC(m) 0 |
| 77 | #define S_ISMPX(m) 0 | ||
| 77 | #define S_ISNWK(m) 0 | 78 | #define S_ISNWK(m) 0 |
| 78 | #define S_ISPORT(m) 0 | 79 | #define S_ISPORT(m) 0 |
| 79 | #define S_ISWHT(m) 0 | 80 | #define S_ISWHT(m) 0 |