From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 96411 invoked by alias); 15 Apr 2016 12:55:28 -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 96389 invoked by uid 9078); 15 Apr 2016 12:55:28 -0000 Date: Fri, 15 Apr 2016 12:55:00 -0000 Message-ID: <20160415125528.96387.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] Provide __size_t via X-Act-Checkin: newlib-cygwin X-Git-Author: Sebastian Huber X-Git-Refname: refs/heads/master X-Git-Oldrev: 40928e19e4a5b0a1a6e60bec658a70961feb93b7 X-Git-Newrev: 3ad9b2fcbab86ad58224c91619782fab2f17f126 X-SW-Source: 2016-q2/txt/msg00031.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=3ad9b2fcbab86ad58224c91619782fab2f17f126 commit 3ad9b2fcbab86ad58224c91619782fab2f17f126 Author: Sebastian Huber Date: Fri Apr 15 13:44:28 2016 +0200 Provide __size_t via Various FreeBSD source and header files need a typedef __size_t via . Unfortunately the GCC provided uses #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \ || defined(__DragonFly__) \ || defined(__FreeBSD_kernel__) /* __size_t is a typedef on FreeBSD 5, must not trash it. */ #elif defined (__VMS__) /* __size_t is also a typedef on VMS. */ #else #define __size_t #endif and therefore defines __size_t on Newlib targets which would trash a __size_t typedef. Include before in and undefine __size_t in as a workaround. Signed-off-by: Sebastian Huber Diff: --- newlib/libc/include/sys/_types.h | 15 +++++++++++++++ newlib/libc/include/sys/types.h | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/newlib/libc/include/sys/_types.h b/newlib/libc/include/sys/_types.h index 6a2c94d..06ddd83 100644 --- a/newlib/libc/include/sys/_types.h +++ b/newlib/libc/include/sys/_types.h @@ -119,6 +119,21 @@ typedef _off64_t _fpos64_t; #endif #endif +/* Defined by GCC provided */ +#undef __size_t + +#ifndef __machine_size_t_defined +#ifdef __SIZE_TYPE__ +typedef __SIZE_TYPE__ __size_t; +#else +#if defined(__INT_MAX__) && __INT_MAX__ == 2147483647 +typedef int __size_t; +#else +typedef long __size_t; +#endif +#endif +#endif + #ifndef __machine_ssize_t_defined #ifdef __SIZE_TYPE__ /* If __SIZE_TYPE__ is defined (gcc) we define ssize_t based on size_t. diff --git a/newlib/libc/include/sys/types.h b/newlib/libc/include/sys/types.h index 57b74ef..31f765e 100644 --- a/newlib/libc/include/sys/types.h +++ b/newlib/libc/include/sys/types.h @@ -56,11 +56,11 @@ typedef quad_t * qaddr_t; #ifndef __need_inttypes #define _SYS_TYPES_H +/* must be before for __size_t considerations */ +#include #include #include -# include - #if __BSD_VISIBLE #include #include