summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--newlib/libc/include/machine/types.h27
-rw-r--r--newlib/libc/include/reent.h1
-rw-r--r--newlib/libc/include/sys/_timespec.h2
-rw-r--r--newlib/libc/include/sys/_timeval.h2
-rw-r--r--newlib/libc/include/sys/_types.h21
-rw-r--r--newlib/libc/include/sys/config.h1
-rw-r--r--newlib/libc/include/sys/timeb.h2
-rw-r--r--newlib/libc/include/sys/times.h2
-rw-r--r--newlib/libc/include/sys/types.h8
-rw-r--r--newlib/libc/sys/linux/sys/_types.h7
-rw-r--r--newlib/libc/sys/linux/sys/types.h1
-rw-r--r--newlib/libc/sys/rtems/include/machine/_types.h3
-rw-r--r--newlib/libc/sys/sparc64/sys/_timeval.h2
-rw-r--r--winsup/cygwin/include/cygwin/types.h7
14 files changed, 40 insertions, 46 deletions
diff --git a/newlib/libc/include/machine/types.h b/newlib/libc/include/machine/types.h
index 4250ee371..669242bf4 100644
--- a/newlib/libc/include/machine/types.h
+++ b/newlib/libc/include/machine/types.h
@@ -2,31 +2,10 @@
#define _MACHTYPES_H_
/*
- * The following section is RTEMS specific and is needed to more
- * closely match the types defined in the BSD machine/types.h.
- * This is needed to let the RTEMS/BSD TCP/IP stack compile.
+ * This file is provided for backward compatibility. It is no longer used in
+ * Newlib. Do not add new things to it.
*/
-#if defined(__rtems__)
-#include <machine/_types.h>
-#endif
-#define _CLOCK_T_ unsigned long /* clock() */
-#define _TIME_T_ long /* time() */
-#define _CLOCKID_T_ unsigned long
-#define _TIMER_T_ unsigned long
-
-#ifndef _HAVE_SYSTYPES
-typedef long int __off_t;
-typedef int __pid_t;
-#ifdef __GNUC__
-__extension__ typedef long long int __loff_t;
-#else
-typedef long int __loff_t;
-#endif
-#endif
-
-typedef long __suseconds_t; /* microseconds (signed) */
+#include <sys/_types.h>
#endif /* _MACHTYPES_H_ */
-
-
diff --git a/newlib/libc/include/reent.h b/newlib/libc/include/reent.h
index 861be71d3..b7664b0b9 100644
--- a/newlib/libc/include/reent.h
+++ b/newlib/libc/include/reent.h
@@ -92,7 +92,6 @@ extern "C" {
#include <sys/reent.h>
#include <sys/_types.h>
-#include <machine/types.h>
#define __need_size_t
#define __need_ptrdiff_t
diff --git a/newlib/libc/include/sys/_timespec.h b/newlib/libc/include/sys/_timespec.h
index bd66dfc71..4a7aabcb1 100644
--- a/newlib/libc/include/sys/_timespec.h
+++ b/newlib/libc/include/sys/_timespec.h
@@ -34,7 +34,7 @@
#ifndef _SYS__TIMESPEC_H_
#define _SYS__TIMESPEC_H_
-#include <machine/types.h>
+#include <sys/_types.h>
#ifndef __time_t_defined
typedef _TIME_T_ time_t;
diff --git a/newlib/libc/include/sys/_timeval.h b/newlib/libc/include/sys/_timeval.h
index 0a4c539d9..d813d1f5b 100644
--- a/newlib/libc/include/sys/_timeval.h
+++ b/newlib/libc/include/sys/_timeval.h
@@ -29,7 +29,7 @@
#ifndef _SYS__TIMEVAL_H_
#define _SYS__TIMEVAL_H_
-#include <machine/types.h>
+#include <sys/_types.h>
#ifndef _SUSECONDS_T_DECLARED
typedef __suseconds_t suseconds_t;
diff --git a/newlib/libc/include/sys/_types.h b/newlib/libc/include/sys/_types.h
index 07bc27675..b38a1617b 100644
--- a/newlib/libc/include/sys/_types.h
+++ b/newlib/libc/include/sys/_types.h
@@ -16,6 +16,12 @@
typedef long _off_t;
#endif
+#if defined(__XMK__)
+typedef signed char __pid_t;
+#else
+typedef int __pid_t;
+#endif
+
#ifndef __dev_t_defined
typedef short __dev_t;
#endif
@@ -31,6 +37,14 @@ typedef unsigned short __gid_t;
__extension__ typedef long long _off64_t;
#endif
+#ifdef __CYGWIN__
+typedef _off64_t __off_t;
+#else
+typedef _off_t __off_t;
+#endif
+
+typedef _off64_t __loff_t;
+
/*
* We need fpos_t for the following, but it doesn't have a leading "_",
* so we use _fpos_t instead.
@@ -88,4 +102,11 @@ typedef _LOCK_RECURSIVE_T _flock_t;
typedef void *_iconv_t;
#endif
+#define _CLOCK_T_ unsigned long /* clock() */
+#define _TIME_T_ long /* time() */
+#define _CLOCKID_T_ unsigned long
+#define _TIMER_T_ unsigned long
+
+typedef long __suseconds_t; /* microseconds (signed) */
+
#endif /* _SYS__TYPES_H */
diff --git a/newlib/libc/include/sys/config.h b/newlib/libc/include/sys/config.h
index c53669823..555239f8b 100644
--- a/newlib/libc/include/sys/config.h
+++ b/newlib/libc/include/sys/config.h
@@ -92,7 +92,6 @@
/* we want the reentrancy structure to be returned by a function */
#define __DYNAMIC_REENT__
#define HAVE_GETDATE
-#define _HAVE_SYSTYPES
#define _READ_WRITE_RETURN_TYPE _ssize_t
#define __LARGE64_FILES 1
/* we use some glibc header files so turn on glibc large file feature */
diff --git a/newlib/libc/include/sys/timeb.h b/newlib/libc/include/sys/timeb.h
index 0a2c3de8b..264783050 100644
--- a/newlib/libc/include/sys/timeb.h
+++ b/newlib/libc/include/sys/timeb.h
@@ -15,7 +15,7 @@ extern "C" {
#define _SYS_TIMEB_H
#include <_ansi.h>
-#include <machine/types.h>
+#include <sys/_types.h>
#ifndef __time_t_defined
typedef _TIME_T_ time_t;
diff --git a/newlib/libc/include/sys/times.h b/newlib/libc/include/sys/times.h
index 927812cb8..dc072f464 100644
--- a/newlib/libc/include/sys/times.h
+++ b/newlib/libc/include/sys/times.h
@@ -5,7 +5,7 @@ extern "C" {
#define _SYS_TIMES_H
#include <_ansi.h>
-#include <machine/types.h>
+#include <sys/_types.h>
#ifndef __clock_t_defined
typedef _CLOCK_T_ clock_t;
diff --git a/newlib/libc/include/sys/types.h b/newlib/libc/include/sys/types.h
index f8808308e..c0b579623 100644
--- a/newlib/libc/include/sys/types.h
+++ b/newlib/libc/include/sys/types.h
@@ -66,7 +66,6 @@ typedef quad_t * qaddr_t;
#endif
# include <stddef.h>
-# include <machine/types.h>
/* To ensure the stat struct's layout doesn't change when sizeof(int), etc.
changes, we assume sizeof short and long never change and have all types
@@ -175,10 +174,9 @@ typedef __uid_t uid_t;
typedef __gid_t gid_t;
#endif
-#if defined(__XMK__)
-typedef signed char pid_t;
-#else
-typedef int pid_t;
+#ifndef _PID_T_DECLARED
+typedef __pid_t pid_t; /* process id */
+#define _PID_T_DECLARED
#endif
#if defined(__rtems__)
diff --git a/newlib/libc/sys/linux/sys/_types.h b/newlib/libc/sys/linux/sys/_types.h
index 1ad429dba..2fd140520 100644
--- a/newlib/libc/sys/linux/sys/_types.h
+++ b/newlib/libc/sys/linux/sys/_types.h
@@ -51,4 +51,11 @@ typedef struct
typedef struct { __flock_mutex_t mutex; } _flock_t;
+#define _CLOCK_T_ unsigned long /* clock() */
+#define _TIME_T_ long /* time() */
+#define _CLOCKID_T_ unsigned long
+#define _TIMER_T_ unsigned long
+
+typedef long __suseconds_t; /* microseconds (signed) */
+
#endif /* _SYS__TYPES_H */
diff --git a/newlib/libc/sys/linux/sys/types.h b/newlib/libc/sys/linux/sys/types.h
index 8e674eff6..20dab2f53 100644
--- a/newlib/libc/sys/linux/sys/types.h
+++ b/newlib/libc/sys/linux/sys/types.h
@@ -54,7 +54,6 @@
#include <stddef.h>
#include <sys/config.h>
#include <features.h>
-#include <machine/types.h>
#include <sys/_types.h>
#if !defined(__time_t_defined) && !defined(_TIME_T)
diff --git a/newlib/libc/sys/rtems/include/machine/_types.h b/newlib/libc/sys/rtems/include/machine/_types.h
index 1711c7ae8..e0d93f7fe 100644
--- a/newlib/libc/sys/rtems/include/machine/_types.h
+++ b/newlib/libc/sys/rtems/include/machine/_types.h
@@ -5,9 +5,6 @@
#ifndef _MACHINE__TYPES_H
#define _MACHINE__TYPES_H
-/* This disables some conflicting type definitions in <machine/types.h> */
-#define _HAVE_SYSTYPES
-
#include <machine/_default_types.h>
typedef __int32_t blksize_t;
diff --git a/newlib/libc/sys/sparc64/sys/_timeval.h b/newlib/libc/sys/sparc64/sys/_timeval.h
index 84ee717bb..fbe9ce64d 100644
--- a/newlib/libc/sys/sparc64/sys/_timeval.h
+++ b/newlib/libc/sys/sparc64/sys/_timeval.h
@@ -1,7 +1,7 @@
#ifndef _SYS_TIME_H
#define _SYS_TIME_H
-#include <machine/types.h>
+#include <sys/_types.h>
#ifndef __time_t_defined
typedef _TIME_T_ time_t;
diff --git a/winsup/cygwin/include/cygwin/types.h b/winsup/cygwin/include/cygwin/types.h
index 61a1bb6d4..bdf40850a 100644
--- a/winsup/cygwin/include/cygwin/types.h
+++ b/winsup/cygwin/include/cygwin/types.h
@@ -34,12 +34,7 @@ typedef struct timespec timestruc_t;
#ifndef __off_t_defined
#define __off_t_defined
-/* Based on the newlib definitions. */
-#if __WORDSIZE == 64
-typedef _off_t off_t;
-#else
-typedef _off64_t off_t;
-#endif
+typedef __off_t off_t;
#endif /*__off_t_defined*/
typedef __loff_t loff_t;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-02 02:00:36 +0000