From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 696 invoked by alias); 19 Feb 2019 08:07:06 -0000 Mailing-List: contact newlib-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: newlib-cvs-owner@sourceware.org Received: (qmail 629 invoked by uid 10080); 19 Feb 2019 08:07:05 -0000 Date: Tue, 19 Feb 2019 08:07:00 -0000 Message-ID: <20190219080705.628.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Sebastian Huber To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] Move RTEMS and XMK specific type definitions X-Act-Checkin: newlib-cygwin X-Git-Author: Sebastian Huber X-Git-Refname: refs/heads/master X-Git-Oldrev: 30782f7de4936bbc4c2e666cbaf587039c895fd3 X-Git-Newrev: 9d4a6534fb218f41ac916aa5dcdb0ce1b55dc245 X-SW-Source: 2019-q1/txt/msg00027.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=9d4a6534fb218f41ac916aa5dcdb0ce1b55dc245 commit 9d4a6534fb218f41ac916aa5dcdb0ce1b55dc245 Author: Sebastian Huber Date: Wed Feb 13 13:42:57 2019 +0100 Move RTEMS and XMK specific type definitions Signed-off-by: Sebastian Huber Diff: --- newlib/libc/include/machine/types.h | 6 ++++++ newlib/libc/include/sys/types.h | 16 ---------------- newlib/libc/sys/rtems/include/machine/types.h | 6 ++++++ 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/newlib/libc/include/machine/types.h b/newlib/libc/include/machine/types.h index a5a64e6..19d0e85 100644 --- a/newlib/libc/include/machine/types.h +++ b/newlib/libc/include/machine/types.h @@ -5,3 +5,9 @@ #ifndef _SYS_TYPES_H #error "must be included via " #endif /* !_SYS_TYPES_H */ + +#if defined(__XMK__) && defined(___int64_t_defined) +typedef __uint64_t u_quad_t; +typedef __int64_t quad_t; +typedef quad_t * qaddr_t; +#endif diff --git a/newlib/libc/include/sys/types.h b/newlib/libc/include/sys/types.h index 65ff520..2685df6 100644 --- a/newlib/libc/include/sys/types.h +++ b/newlib/libc/include/sys/types.h @@ -39,22 +39,6 @@ typedef __uint64_t u_int64_t; typedef int register_t; #define __BIT_TYPES_DEFINED__ 1 -#if defined(__rtems__) || defined(__XMK__) -/* - * The following section is RTEMS specific and is needed to more - * closely match the types defined in the BSD sys/types.h. - * This is needed to let the RTEMS/BSD TCP/IP stack compile. - */ - -/* deprecated */ -#if ___int64_t_defined -typedef __uint64_t u_quad_t; -typedef __int64_t quad_t; -typedef quad_t * qaddr_t; -#endif - -#endif /* __rtems__ || __XMK__ */ - #ifndef __need_inttypes #define _SYS_TYPES_H diff --git a/newlib/libc/sys/rtems/include/machine/types.h b/newlib/libc/sys/rtems/include/machine/types.h index ab52e47..c550873 100644 --- a/newlib/libc/sys/rtems/include/machine/types.h +++ b/newlib/libc/sys/rtems/include/machine/types.h @@ -62,6 +62,12 @@ typedef __lwpid_t lwpid_t; /* Thread ID (a.k.a. LWP) */ #define _LWPID_T_DECLARED #endif +#if ___int64_t_defined +typedef __uint64_t u_quad_t; +typedef __int64_t quad_t; +typedef quad_t * qaddr_t; +#endif + #ifndef _RLIM_T_DECLARED typedef __rlim_t rlim_t; /* resource limit */ #define _RLIM_T_DECLARED