From 9bc6f25db5fc31b5c579f27403d370731d88c40c Mon Sep 17 00:00:00 2001 From: Maya Rashish Date: Sun, 24 Jun 2018 21:32:40 +0000 Subject: [PATCH] stddef.h: Simplify conditions around avoiding re-definition of __size_t. * ginclude/stddef.h: Simplify conditions around avoiding re-definition of __size_t. From-SVN: r261998 --- gcc/ChangeLog | 5 +++++ gcc/ginclude/stddef.h | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 61df1473fcc..c40df21200b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2018-06-24 Maya Rashish + + * ginclude/stddef.h: Simplify conditions around avoiding + re-definition of __size_t. + 2018-06-22 Jan Hubicka * lto-streamer-out.c (tree_is_indexable): Make LABEL_DECL nonindexable diff --git a/gcc/ginclude/stddef.h b/gcc/ginclude/stddef.h index 15a99e7da48..8d5a73ab501 100644 --- a/gcc/ginclude/stddef.h +++ b/gcc/ginclude/stddef.h @@ -196,10 +196,9 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t; #define _SIZET_ #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. */ + || defined(__FreeBSD_kernel__) \ + || defined(__VMS__) +/* __size_t is a typedef, must not trash it. */ #else #define __size_t #endif -- 2.30.2