From: gerald <gerald@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 24 Jun 2018 21:32:40 +0000 (+0000)
Subject: 	* ginclude/stddef.h: Simplify conditions around avoiding
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b6d2c36aa9f1ca54e3190ce82c77115b1ca798df;p=thirdparty%2Fgcc.git

	* ginclude/stddef.h: Simplify conditions around avoiding
	re-definition of __size_t.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@261998 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 61df1473fcc8..c40df21200b9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2018-06-24  Maya Rashish  <coypu@sdf.org>
+
+	* ginclude/stddef.h: Simplify conditions around avoiding
+	re-definition of __size_t.
+
 2018-06-22  Jan Hubicka  <hubicka@ucw.cz>
 
 	* lto-streamer-out.c (tree_is_indexable): Make LABEL_DECL nonindexable
diff --git a/gcc/ginclude/stddef.h b/gcc/ginclude/stddef.h
index 15a99e7da48b..8d5a73ab5014 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