diff options
| author | Vibhav Pant | 2020-08-21 14:04:35 +0530 |
|---|---|---|
| committer | Vibhav Pant | 2020-08-21 14:04:35 +0530 |
| commit | f0f8d7b82492e741950c363a03b886965c91b1b0 (patch) | |
| tree | 19b716830b1ebabc0d7d75949c4e6800c0f104ad /lib/time.in.h | |
| parent | 9e64a087c4d167e7ec1c4e22bea3e6af53b563de (diff) | |
| parent | c818c29771d3cb51875643b2f6c894073e429dd2 (diff) | |
| download | emacs-feature/native-comp-macos-fixes.tar.gz emacs-feature/native-comp-macos-fixes.zip | |
Merge branch 'feature/native-comp' into feature/native-comp-macos-fixesfeature/native-comp-macos-fixes
Diffstat (limited to 'lib/time.in.h')
| -rw-r--r-- | lib/time.in.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/time.in.h b/lib/time.in.h index 1d11650e77f..32e6ec03ef4 100644 --- a/lib/time.in.h +++ b/lib/time.in.h | |||
| @@ -135,13 +135,19 @@ _GL_CXXALIASWARN (nanosleep); | |||
| 135 | # endif | 135 | # endif |
| 136 | _GL_FUNCDECL_RPL (tzset, void, (void)); | 136 | _GL_FUNCDECL_RPL (tzset, void, (void)); |
| 137 | _GL_CXXALIAS_RPL (tzset, void, (void)); | 137 | _GL_CXXALIAS_RPL (tzset, void, (void)); |
| 138 | # else | 138 | # elif defined _WIN32 && !defined __CYGWIN__ |
| 139 | # if ! @HAVE_TZSET@ | 139 | # if !(defined __cplusplus && defined GNULIB_NAMESPACE) |
| 140 | _GL_FUNCDECL_SYS (tzset, void, (void)); | 140 | # undef tzset |
| 141 | # define tzset _tzset | ||
| 141 | # endif | 142 | # endif |
| 143 | _GL_CXXALIAS_MDA (tzset, void, (void)); | ||
| 144 | # else | ||
| 142 | _GL_CXXALIAS_SYS (tzset, void, (void)); | 145 | _GL_CXXALIAS_SYS (tzset, void, (void)); |
| 143 | # endif | 146 | # endif |
| 144 | _GL_CXXALIASWARN (tzset); | 147 | _GL_CXXALIASWARN (tzset); |
| 148 | # elif defined _WIN32 && !defined __CYGWIN__ | ||
| 149 | # undef tzset | ||
| 150 | # define tzset _tzset | ||
| 145 | # endif | 151 | # endif |
| 146 | 152 | ||
| 147 | /* Return the 'time_t' representation of TP and normalize TP. */ | 153 | /* Return the 'time_t' representation of TP and normalize TP. */ |