Author: jonpryor
Date: 2006-11-01 21:35:09 -0500 (Wed, 01 Nov 2006)
New Revision: 67252

Modified:
   trunk/mono/ChangeLog
   trunk/mono/configure.in
   trunk/mono/support/ChangeLog
   trunk/mono/support/mph.h
Log:
        * 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.)


Modified: trunk/mono/ChangeLog
===================================================================
--- trunk/mono/ChangeLog        2006-11-02 01:50:30 UTC (rev 67251)
+++ trunk/mono/ChangeLog        2006-11-02 02:35:09 UTC (rev 67252)
@@ -1,3 +1,8 @@
+2006-11-01  Jonathan Pryor  <[EMAIL PROTECTED]>
+
+       * 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  <[EMAIL PROTECTED]>
 
        * configure.in: Add type checks for structs pollfd, stat, timeval, 
timezone.

Modified: trunk/mono/configure.in
===================================================================
--- trunk/mono/configure.in     2006-11-02 01:50:30 UTC (rev 67251)
+++ trunk/mono/configure.in     2006-11-02 02:35:09 UTC (rev 67252)
@@ -1273,6 +1273,16 @@
        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)], ,

Modified: trunk/mono/support/ChangeLog
===================================================================
--- trunk/mono/support/ChangeLog        2006-11-02 01:50:30 UTC (rev 67251)
+++ trunk/mono/support/ChangeLog        2006-11-02 02:35:09 UTC (rev 67252)
@@ -1,3 +1,9 @@
+2006-11-01  Jonathan Pryor  <[EMAIL PROTECTED]>
+
+       * 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  <[EMAIL PROTECTED]>
 
        * map.c: Improve handling of [Flags] enumerations which mix bitfields 
and

Modified: trunk/mono/support/mph.h
===================================================================
--- trunk/mono/support/mph.h    2006-11-02 01:50:30 UTC (rev 67251)
+++ trunk/mono/support/mph.h    2006-11-02 02:35:09 UTC (rev 67252)
@@ -65,6 +65,19 @@
 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

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to