diff options
| author | Paul Eggert | 2024-06-30 00:08:28 +0100 |
|---|---|---|
| committer | Paul Eggert | 2024-06-30 01:03:16 +0100 |
| commit | 4a8c8021cc311626fbfa55e68c524195ce466738 (patch) | |
| tree | f226578d351b7421f7c32827deda19d73e02ab10 /lib/time.in.h | |
| parent | fad7109e52208bf77da468c2c73545c084bc1557 (diff) | |
| download | emacs-4a8c8021cc311626fbfa55e68c524195ce466738.tar.gz emacs-4a8c8021cc311626fbfa55e68c524195ce466738.zip | |
Update from Gnulib by running admin/merge-gnulib
* m4/wchar_t.m4: Remove; no longer needed.
Diffstat (limited to 'lib/time.in.h')
| -rw-r--r-- | lib/time.in.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/lib/time.in.h b/lib/time.in.h index df99c8abca9..b91018937ad 100644 --- a/lib/time.in.h +++ b/lib/time.in.h | |||
| @@ -122,6 +122,23 @@ struct __time_t_must_be_integral { | |||
| 122 | # endif | 122 | # endif |
| 123 | # endif | 123 | # endif |
| 124 | 124 | ||
| 125 | # if @GNULIB_TZNAME@ | ||
| 126 | /* tzname[0..1]: Abbreviated time zone names, set by the tzset() function. */ | ||
| 127 | # if NEED_DECL_TZNAME | ||
| 128 | extern | ||
| 129 | # ifdef __cplusplus | ||
| 130 | "C" | ||
| 131 | # endif | ||
| 132 | char *tzname[]; | ||
| 133 | # endif | ||
| 134 | # if defined _WIN32 && !defined __CYGWIN__ | ||
| 135 | /* On native Windows, map 'tzname' to '_tzname' etc., so that -loldnames is not | ||
| 136 | required. */ | ||
| 137 | # undef tzname | ||
| 138 | # define tzname _tzname | ||
| 139 | # endif | ||
| 140 | # endif | ||
| 141 | |||
| 125 | /* Set *TS to the current time, and return BASE. | 142 | /* Set *TS to the current time, and return BASE. |
| 126 | Upon failure, return 0. */ | 143 | Upon failure, return 0. */ |
| 127 | # if @GNULIB_TIMESPEC_GET@ | 144 | # if @GNULIB_TIMESPEC_GET@ |