summaryrefslogtreecommitdiff
path: root/libc/debian/patches/struct-tm.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libc/debian/patches/struct-tm.patch')
-rw-r--r--libc/debian/patches/struct-tm.patch25
1 files changed, 11 insertions, 14 deletions
diff --git a/libc/debian/patches/struct-tm.patch b/libc/debian/patches/struct-tm.patch
index 7a90175..bc4b9e0 100644
--- a/libc/debian/patches/struct-tm.patch
+++ b/libc/debian/patches/struct-tm.patch
@@ -5,16 +5,16 @@ Index: libc/usr/src/head/iso/time_iso.h
===================================================================
--- libc.orig/usr/src/head/iso/time_iso.h
+++ libc/usr/src/head/iso/time_iso.h
-@@ -45,7 +45,7 @@
-
- #pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.18 */
+@@ -44,7 +44,7 @@
+ #ifndef _ISO_TIME_ISO_H
+ #define _ISO_TIME_ISO_H
-#include <sys/feature_tests.h>
+#include <features.h>
#ifdef __cplusplus
extern "C" {
-@@ -94,9 +94,15 @@ struct tm { /* see ctime(3) */
+@@ -93,6 +93,13 @@ struct tm { /* see ctime(3) */
int tm_wday;
int tm_yday;
int tm_isdst;
@@ -27,11 +27,8 @@ Index: libc/usr/src/head/iso/time_iso.h
+#endif
};
--
- #if defined(__STDC__)
- extern char *asctime(const struct tm *);
-@@ -105,11 +111,21 @@ extern char *ctime(const time_t *);
+@@ -102,11 +109,21 @@ extern char *ctime(const time_t *);
extern double difftime(time_t, time_t);
extern struct tm *gmtime(const time_t *);
extern struct tm *localtime(const time_t *);
@@ -42,8 +39,8 @@ Index: libc/usr/src/head/iso/time_iso.h
+#ifndef __IN_LIBC
+#ifdef __PRAGMA_REDEFINE_EXTNAME
-+extern time_t mktime(struct tm *);
+#pragma redefine_extname mktime __gnu_mktime
++extern time_t mktime(struct tm *);
+#else
+static time_t mktime(struct tm *___tm) {
+ return __gnu_mktime(___tm);
@@ -51,14 +48,14 @@ Index: libc/usr/src/head/iso/time_iso.h
+#endif
+#endif /* __IN_LIBC */
+
- #else /* __STDC__ */
-
- extern char *asctime();
+ #if __cplusplus >= 199711L
+ }
+ #endif /* end of namespace std */
Index: libc/usr/src/head/time.h
===================================================================
--- libc.orig/usr/src/head/time.h
+++ libc/usr/src/head/time.h
-@@ -33,7 +33,7 @@
+@@ -35,7 +35,7 @@
#ifndef _TIME_H
#define _TIME_H
@@ -258,7 +255,7 @@ Index: libc/usr/src/lib/libc/port/mapfile-vers
===================================================================
--- libc.orig/usr/src/lib/libc/port/mapfile-vers
+++ libc/usr/src/lib/libc/port/mapfile-vers
-@@ -120,6 +120,10 @@ SYMBOL_VERSION ILLUMOS_0.4 { # Illumos a
+@@ -262,6 +262,10 @@ SYMBOL_VERSION ILLUMOS_0.4 { # Illumos a
SYMBOL_VERSION DYSON_1 {
global: