* configure.in: Add type checks for blkcnt_t, blksize_t, suseconds_t. Some

	  versions of Mac OS X don't define these, needed by support/map.c.
	* support/mph.h: Add fallback typedefs for blkcnt_t, blksize_t, suseconds_t
	  so that map.c can rely on their presence.  (Some versions of OS X don't
	  provide these typedefs.)

svn path=/trunk/mono/; revision=67252

diff --git a/ChangeLog b/ChangeLog
index e843d55dfbd5d04db6f7828c658d5a2a09afd07d..cb7b075cbfacdad359f05ee88658f304bc072ff1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-01  Jonathan Pryor  <jonpryor@vt.edu>
+
+       * configure.in: Add type checks for blkcnt_t, blksize_t, suseconds_t.  Some
+         versions of Mac OS X don't define these, needed by support/map.c.
+
 2006-10-26  Jonathan Pryor  <jonpryor@vt.edu>
 
        * configure.in: Add type checks for structs pollfd, stat, timeval, timezone.

diff --git a/configure.in b/configure.in
index 2f75d642bb63445281287f774daedc7ece79f8ae..6ad586f52883ee8a71281bc037382fab6b20ffaf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1273,6 +1273,16 @@ if test x$platform_win32 = xno; then
        AC_CHECK_FUNCS(strerror_r)
        AC_CHECK_FUNCS(ttyname_r)
        AC_CHECK_SIZEOF(size_t)
+       AC_CHECK_TYPES([blksize_t], [AC_DEFINE(HAVE_BLKSIZE_T)], , 
+               [#include <sys/types.h>
+                #include <sys/stat.h>
+                #include <unistd.h>])
+       AC_CHECK_TYPES([blkcnt_t], [AC_DEFINE(HAVE_BLKCNT_T)], ,
+               [#include <sys/types.h>
+                #include <sys/stat.h>
+                #include <unistd.h>])
+       AC_CHECK_TYPES([suseconds_t], [AC_DEFINE(HAVE_SUSECONDS_T)], ,
+               [#include <sys/time.h>])
        AC_CHECK_TYPES([struct pollfd], [AC_DEFINE(HAVE_STRUCT_POLLFD)], ,
                [#include <sys/poll.h>])
        AC_CHECK_TYPES([struct stat], [AC_DEFINE(HAVE_STRUCT_STAT)], ,

diff --git a/support/ChangeLog b/support/ChangeLog
index 132c9f9e2b3831dfe5de7fad8162e541bca4cef1..de4f03f28d084ff845e6f9b1d11d16d44767ed5b 100644 (file)
--- a/support/ChangeLog
+++ b/support/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-01  Jonathan Pryor  <jonpryor@vt.edu>
+
+       * mph.h: Add fallback typedefs for blkcnt_t, blksize_t, suseconds_t so that
+         map.c can rely on their presence.  (Some versions of OS X don't provide
+         these typedefs.)
+
 2006-10-27  Jonathan Pryor  <jonpryor@vt.edu>
 
        * map.c: Improve handling of [Flags] enumerations which mix bitfields and

diff --git a/support/mph.h b/support/mph.h
index 96bd39e58dbb36d57af996256678c0f7974e6238..14458a034793f98157a2f9e58eb31fc255f06ae3 100644 (file)
--- a/support/mph.h
+++ b/support/mph.h
@@ -65,6 +65,19 @@ typedef    gint64 mph_clock_t;
 typedef   guint64 mph_fsblkcnt_t;
 typedef   guint64 mph_fsfilcnt_t;
 
+/* Some versions of OS X don't define these typedefs, needed by map.c */
+#ifndef HAVE_BLKCNT_T
+typedef mph_blkcnt_t blkcnt_t;
+#endif
+
+#ifndef HAVE_BLKSIZE_T
+typedef mph_blksize_t blksize_t;
+#endif
+
+#ifndef HAVE_SUSECONDS_T
+typedef gint64 suseconds_t;
+#endif
+
 #ifdef HAVE_LARGE_FILE_SUPPORT
 #define MPH_OFF_T_MAX G_MAXINT64
 #define MPH_OFF_T_MIN G_MININT64