diff options
| author | Paul Eggert | 2017-01-01 01:32:27 -0800 |
|---|---|---|
| committer | Paul Eggert | 2017-01-01 01:32:56 -0800 |
| commit | 5a59e28dec039453aaad27fd0919bb93ed517079 (patch) | |
| tree | aea1913198992523e05fc1b52c9930df9de052cb /m4/st_dm_mode.m4 | |
| parent | bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9 (diff) | |
| download | emacs-5a59e28dec039453aaad27fd0919bb93ed517079.tar.gz emacs-5a59e28dec039453aaad27fd0919bb93ed517079.zip | |
Merge from gnulib
This incorporates:
2016-12-19 stdint: Fix WINT_MAX to match wint_t on mingw
2016-12-18 getopt: Fix link error for users of getopt() in <unistd.h>
2016-12-17 getlogin: Port to newer mingw
2016-12-17 stdint: Fix WINT_MAX to match wint_t on MSVC
2016-12-17 Avoid redefinition errors on MSVC
* lib/getopt.in.h, lib/stdint.in.h, lib/stdio.in.h, lib/unistd.in.h:
* m4/stdint.m4, m4/unistd_h.m4:
Copy from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
Plus, this commit updates the indenting on copyright notices to
match that of gnulib.
Diffstat (limited to 'm4/st_dm_mode.m4')
| -rw-r--r-- | m4/st_dm_mode.m4 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/m4/st_dm_mode.m4 b/m4/st_dm_mode.m4 index af6757e8a38..ed2cff8c2cc 100644 --- a/m4/st_dm_mode.m4 +++ b/m4/st_dm_mode.m4 | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | # serial 6 | 1 | # serial 6 |
| 2 | 2 | ||
| 3 | # Copyright (C) 1998-1999, 2001, 2009-2017 Free Software Foundation, | 3 | # Copyright (C) 1998-1999, 2001, 2009-2017 Free Software Foundation, Inc. |
| 4 | # Inc. | ||
| 5 | # This file is free software; the Free Software Foundation | 4 | # This file is free software; the Free Software Foundation |
| 6 | # gives unlimited permission to copy and/or distribute it, | 5 | # gives unlimited permission to copy and/or distribute it, |
| 7 | # with or without modifications, as long as this notice is preserved. | 6 | # with or without modifications, as long as this notice is preserved. |