diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 01:32:27 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 01:32:56 -0800 |
| commit | 5a59e28dec039453aaad27fd0919bb93ed517079 (patch) | |
| tree | aea1913198992523e05fc1b52c9930df9de052cb /lib/getloadavg.c | |
| parent | bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9 (diff) | |
| download | emacs-5a59e28dec039453aaad27fd0919bb93ed517079.tar.gz | |
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 'lib/getloadavg.c')
| -rw-r--r-- | lib/getloadavg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/getloadavg.c b/lib/getloadavg.c index 123dac511be..0fe23bb9a59 100644 --- a/lib/getloadavg.c +++ b/lib/getloadavg.c @@ -1,7 +1,7 @@ /* Get the system load averages. - Copyright (C) 1985-1989, 1991-1995, 1997, 1999-2000, 2003-2017 Free - Software Foundation, Inc. + Copyright (C) 1985-1989, 1991-1995, 1997, 1999-2000, 2003-2017 Free Software + Foundation, Inc. NOTE: The canonical source of this file is maintained with gnulib. Bugs can be reported to bug-gnulib@gnu.org. |