From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 23 Sep 2013 10:03:56 +0000 (+0200)
Subject: 	* grub-core/lib/posix_wrap/sys/types.h: Use OpenBSD approach: it's
X-Git-Tag: grub-2.02-beta1~831
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5dd8205424bac1fad2e9757f650b7d21b5b708d8;p=thirdparty%2Fgrub.git

	* grub-core/lib/posix_wrap/sys/types.h: Use OpenBSD approach: it's
	less nice but more portable.
	* grub-core/lib/posix_wrap/wchar.h: Likewise.
---

diff --git a/grub-core/lib/posix_wrap/sys/types.h b/grub-core/lib/posix_wrap/sys/types.h
index ca7fb53f6..854eb0122 100644
--- a/grub-core/lib/posix_wrap/sys/types.h
+++ b/grub-core/lib/posix_wrap/sys/types.h
@@ -21,11 +21,7 @@
 
 #include <grub/misc.h>
 
-#if defined (__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <stddef.h>
-#else
-typedef grub_size_t size_t;
-#endif
 
 typedef grub_ssize_t ssize_t;
 #ifndef GRUB_POSIX_BOOL_DEFINED
diff --git a/grub-core/lib/posix_wrap/wchar.h b/grub-core/lib/posix_wrap/wchar.h
index 8222140ea..d5d7741de 100644
--- a/grub-core/lib/posix_wrap/wchar.h
+++ b/grub-core/lib/posix_wrap/wchar.h
@@ -21,10 +21,8 @@
 
 #include <grub/charset.h>
 
-#if defined(__NetBSD__) || defined(__OpenBSD__)
 #define wchar_t grub_posix_wchar_t
 #define mbstate_t grub_posix_mbstate_t
-#endif
 
 /* UCS-4.  */
 typedef grub_int32_t wint_t;