aboutsummaryrefslogtreecommitdiff
path: root/newlib/libc/include
diff options
context:
space:
mode:
authorTorbjörn SVENSSON via Newlib <newlib@sourceware.org>2020-10-05 14:50:13 +0200
committerCorinna Vinschen <corinna@vinschen.de>2020-10-15 16:59:51 +0200
commit7ed952000c2e43f4297fe247f0331e50a14cd688 (patch)
treea657c15f08c95c72424e041f7ef2498841a3aaa3 /newlib/libc/include
parent93216e27916bd588fc01425bcb18498672dcaa10 (diff)
downloadnewlib-7ed952000c2e43f4297fe247f0331e50a14cd688.zip
newlib-7ed952000c2e43f4297fe247f0331e50a14cd688.tar.gz
newlib-7ed952000c2e43f4297fe247f0331e50a14cd688.tar.bz2
libc/time: Move internal newlib tz-structs into own header
As discussed in GCC bug 97088 (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=97088), parameters in prototypes of library functions should use reserved names, or no name at all. This patch moves the internal struct __tzrule_struct to its own internal header sys/_tz_structs.h. This is included from newlib's time code as well as from Cygwin's localtime wrapper. Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@st.com> Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'newlib/libc/include')
-rw-r--r--newlib/libc/include/sys/_tz_structs.h24
-rw-r--r--newlib/libc/include/time.h20
2 files changed, 24 insertions, 20 deletions
diff --git a/newlib/libc/include/sys/_tz_structs.h b/newlib/libc/include/sys/_tz_structs.h
new file mode 100644
index 0000000..9610b06
--- /dev/null
+++ b/newlib/libc/include/sys/_tz_structs.h
@@ -0,0 +1,24 @@
+#ifndef _SYS__TZ_STRUCTS_H_
+#define _SYS__TZ_STRUCTS_H_
+
+typedef struct __tzrule_struct
+{
+ char ch;
+ int m; /* Month of year if ch=M */
+ int n; /* Week of month if ch=M */
+ int d; /* Day of week if ch=M, day of year if ch=J or ch=D */
+ int s; /* Time of day in seconds */
+ time_t change;
+ long offset; /* Match type of _timezone. */
+} __tzrule_type;
+
+typedef struct __tzinfo_struct
+{
+ int __tznorth;
+ int __tzyear;
+ __tzrule_type __tzrule[2];
+} __tzinfo_type;
+
+__tzinfo_type *__gettzinfo (void);
+
+#endif /* _SYS__TZ_STRUCTS_H_ */
diff --git a/newlib/libc/include/time.h b/newlib/libc/include/time.h
index 3031590..ed6cc70 100644
--- a/newlib/libc/include/time.h
+++ b/newlib/libc/include/time.h
@@ -102,26 +102,6 @@ void tzset (void);
#endif
void _tzset_r (struct _reent *);
-typedef struct __tzrule_struct
-{
- char ch;
- int m;
- int n;
- int d;
- int s;
- time_t change;
- long offset; /* Match type of _timezone. */
-} __tzrule_type;
-
-typedef struct __tzinfo_struct
-{
- int __tznorth;
- int __tzyear;
- __tzrule_type __tzrule[2];
-} __tzinfo_type;
-
-__tzinfo_type *__gettzinfo (void);
-
/* getdate functions */
#ifdef HAVE_GETDATE