diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2015-03-31 00:10:41 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2015-03-31 00:10:41 +0300 |
| commit | f23c6ca3342d8282d7c69cf4c134b7ab28ea8591 (patch) | |
| tree | 389e6d1edb8312cdd487c62037e2f71095fe54c5 /libc/debian/patches | |
| parent | 69d738e29aa6266d52d76736ffc66d8e8cb9ffb2 (diff) | |
| download | illumos-packaging-f23c6ca3342d8282d7c69cf4c134b7ab28ea8591.tar.gz | |
No redefine_extname
Diffstat (limited to 'libc/debian/patches')
| -rw-r--r-- | libc/debian/patches/struct-tm.patch | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/libc/debian/patches/struct-tm.patch b/libc/debian/patches/struct-tm.patch index 98a9b9d..a46e600 100644 --- a/libc/debian/patches/struct-tm.patch +++ b/libc/debian/patches/struct-tm.patch @@ -41,25 +41,20 @@ Index: libc/usr/src/head/time.h #include <iso/time_iso.h> #if (!defined(_STRICT_STDC) && !defined(__XOPEN_OR_POSIX)) || \ (_POSIX_C_SOURCE > 2) || defined(__EXTENSIONS__) -@@ -80,10 +80,21 @@ typedef int timer_t; +@@ -80,10 +80,14 @@ typedef int timer_t; #if defined(__EXTENSIONS__) || \ (!defined(_STRICT_STDC) && !defined(__XOPEN_OR_POSIX)) || \ (_POSIX_C_SOURCE - 0 >= 199506L) || defined(_REENTRANT) +-extern struct tm *gmtime_r(const time_t *_RESTRICT_KYWD, +extern struct tm *__gnu_gmtime_r(const time_t *_RESTRICT_KYWD, -+ struct tm *_RESTRICT_KYWD); -+extern struct tm *__gnu_localtime_r(const time_t *_RESTRICT_KYWD, -+ struct tm *_RESTRICT_KYWD); -+#ifdef __PRAGMA_REDEFINE_EXTNAME -+#pragma redefine_extname gmtime_r __gnu_gmtime_r -+#pragma redefine_extname localtime_r __gnu_localtime_r - extern struct tm *gmtime_r(const time_t *_RESTRICT_KYWD, struct tm *_RESTRICT_KYWD); - extern struct tm *localtime_r(const time_t *_RESTRICT_KYWD, +-extern struct tm *localtime_r(const time_t *_RESTRICT_KYWD, ++extern struct tm *__gnu_localtime_r(const time_t *_RESTRICT_KYWD, struct tm *_RESTRICT_KYWD); -+#else /* __PRAGMA_REDEFINE_EXTNAME */ ++#undef gmtime_r ++#undef localtime_r +#define gmtime_r __gnu_gmtime_r +#define localtime_r __gnu_localtime_r -+#endif /* __PRAGMA_REDEFINE_EXTNAME */ #endif #if (!defined(_STRICT_STDC) && !defined(__XOPEN_OR_POSIX)) || \ |