summaryrefslogtreecommitdiff
path: root/lib/mktime-internal.h
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2017-01-01 01:32:27 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2017-01-01 01:32:56 -0800
commit5a59e28dec039453aaad27fd0919bb93ed517079 (patch)
treeaea1913198992523e05fc1b52c9930df9de052cb /lib/mktime-internal.h
parentbcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9 (diff)
downloademacs-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/mktime-internal.h')
-rw-r--r--lib/mktime-internal.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mktime-internal.h b/lib/mktime-internal.h
index 2f586aef641..6c8b2e7f526 100644
--- a/lib/mktime-internal.h
+++ b/lib/mktime-internal.h
@@ -1,6 +1,6 @@
/* mktime variant that also uses an offset guess
- Copyright 2016 Free Software Foundation, Inc.
+ Copyright 2016-2017 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public