* grub-core/lib/posix_wrap/sys/types.h [__APPLE__]: Include stddef

	rather than defining size_t ourselves to avoid conflict.

diff --git a/ChangeLog b/ChangeLog
index e3270830a075e07430b5c254bcf7b41ffd6da95c..673e812d3a88a64f77659a9427ec955859903405 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/lib/posix_wrap/sys/types.h [__APPLE__]: Include stddef
+       rather than defining size_t ourselves to avoid conflict.
+
 2012-05-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/fs/hfs.c (grub_hfs_dir): Use memset instead of

diff --git a/grub-core/lib/posix_wrap/sys/types.h b/grub-core/lib/posix_wrap/sys/types.h
index b2181160658aaf1a8e5131cab25d28ea5c8b412f..0e61b7228f6448b28ce083d3271b25a72cdd31e7 100644 (file)
--- a/grub-core/lib/posix_wrap/sys/types.h
+++ b/grub-core/lib/posix_wrap/sys/types.h
@@ -21,7 +21,11 @@
 
 #include <grub/misc.h>
 
+#ifndef __APPLE__
 typedef grub_size_t size_t;
+#else
+#include <stddef.h>
+#endif
 typedef grub_ssize_t ssize_t;
 #ifndef GRUB_POSIX_BOOL_DEFINED
 typedef enum { false = 0, true = 1 } bool;