* 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 ca7fb53f6e6ff9117cd081144e4fcab419802ae9..854eb0122efaa55f58085f067b52fa93ce5e7cda 100644 (file)
--- 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 8222140ea49713bf0cc315199c790422fa794973..d5d7741dec9da4c84c1a8e7c49289ffba8e173d1 100644 (file)
--- 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;