From: zrj <rimvydas.jasinskas@gmail.com>
Date: Sat, 20 Aug 2016 12:14:26 +0000 (+0300)
Subject: Prevent dports gcc "fixing" the last headers.
X-Git-Tag: v4.8.0rc~1099
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/2d41827330aeaa92d96004ff2b272a3818ab34ae

Prevent dports gcc "fixing" the last headers.

Just mention _GCC_(PTRDIFF|SIZE|WCHAR)_T in comments to force 'gnu_types'
test to skip and not fix these headers. DragonFly types should be fine.
---

diff --git a/include/stddef.h b/include/stddef.h
index bc4eee15fa..23b0d538f8 100644
--- a/include/stddef.h
+++ b/include/stddef.h
@@ -42,12 +42,12 @@
 
 #ifndef _SIZE_T_DECLARED
 #define _SIZE_T_DECLARED
-typedef	__size_t	size_t;		/* open group */
+typedef	__size_t	size_t;		/* open group, _GCC_SIZE_T OK */
 #endif
 
 #ifndef _PTRDIFF_T_DECLARED
 #define _PTRDIFF_T_DECLARED
-typedef	__ptrdiff_t	ptrdiff_t;	/* open group */
+typedef	__ptrdiff_t	ptrdiff_t;	/* open group, _GCC_PTRDIFF_T OK */
 #endif
 
 #if __BSD_VISIBLE
@@ -60,7 +60,7 @@ typedef	__rune_t	rune_t;
 #ifndef	__cplusplus
 #ifndef _WCHAR_T_DECLARED
 #define _WCHAR_T_DECLARED
-typedef __wchar_t	wchar_t;	/* open group */
+typedef	__wchar_t	wchar_t;	/* open group, _GCC_WCHAR_T OK */
 #endif
 #endif
 
diff --git a/include/stdlib.h b/include/stdlib.h
index 016f36650e..f7fd367cef 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -45,13 +45,13 @@ typedef	__rune_t	rune_t;
 #endif
 
 #ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
+typedef	__size_t	size_t;		/* _GCC_SIZE_T OK */
 #define	_SIZE_T_DECLARED
 #endif
 
 #ifndef	__cplusplus
 #ifndef _WCHAR_T_DECLARED
-typedef	__wchar_t	wchar_t;
+typedef	__wchar_t	wchar_t;	/* _GCC_WCHAR_T OK */
 #define	_WCHAR_T_DECLARED
 #endif
 #endif
diff --git a/include/unistd.h b/include/unistd.h
index 13013d745c..6f01a826b6 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -58,7 +58,7 @@ typedef	__pid_t		pid_t;
 #endif
 
 #ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
+typedef	__size_t	size_t;		/* _GCC_SIZE_T OK */
 #define	_SIZE_T_DECLARED
 #endif
 
diff --git a/sys/sys/types.h b/sys/sys/types.h
index c10e236a87..580ca0fc22 100644
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -184,7 +184,7 @@ typedef	__clockid_t	clockid_t;
 
 #ifndef _SIZE_T_DECLARED
 #define	_SIZE_T_DECLARED
-typedef	__size_t	size_t;
+typedef	__size_t	size_t;		/* _GCC_SIZE_T OK */
 #endif
 
 #ifndef _SSIZE_T_DECLARED