X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=support%2Fmph.h;h=e5992e5e71f03357080123ffb7a460016db8c488;hb=52e98abd6e5c6d10ddea91a529f7b1b2336e0696;hp=224f01093333f715a3408958c87047673c7b07cf;hpb=aaf6f0a81667378a517259bd7356b88be5ec8c02;p=mono.git

diff --git a/support/mph.h b/support/mph.h
index 224f0109333..e5992e5e71f 100644
--- a/support/mph.h
+++ b/support/mph.h
@@ -36,7 +36,7 @@
 #include <stdint.h>             /* for SIZE_MAX */
 #endif
 
-#if __APPLE__ || __BSD__ || __FreeBSD__
+#if __APPLE__ || __BSD__ || __FreeBSD__ || __OpenBSD__
 #define MPH_ON_BSD
 #endif
 
@@ -46,15 +46,17 @@
 #define MPH_INTERNAL
 #endif
 
-#if defined (PLATFORM_WIN32) && !defined (EOVERFLOW)
-#define EOVERFLOW 75
-#endif /* def PLATFORM_WIN32 && ndef EOVERFLOW */
-
-#if !defined (PLATFORM_WIN32)
+#if !defined(EOVERFLOW)
+#  if defined(HOST_WIN32)
+#    define EOVERFLOW 75
+#  elif defined(__OpenBSD__)
+#    define EOVERFLOW 87
+#  endif
+#endif /* !defined(EOVERFLOW) */
 
 /* 
- * Solaris doesn't define these BSD values, and if they're not present then
- * map.c:Mono_Posix_FromSeekFlags() breaks badly; see:
+ * Solaris/Windows don't define these BSD values, and if they're not present
+ * then map.c:Mono_Posix_FromSeekFlags() breaks badly; see:
  * http://bugzilla.gnome.org/show_bug.cgi?id=370081
  */
 
@@ -70,6 +72,18 @@
 #define L_XTND SEEK_END
 #endif /* ndef L_XTND */
 
+#if !defined (HOST_WIN32)
+
+/*
+ * OS X doesn't define MAP_ANONYMOUS, but it does define MAP_ANON.
+ * Alias them to fix: https://bugzilla.xamarin.com/show_bug.cgi?id=3419
+ */
+#ifdef HOST_DARWIN
+#ifndef MAP_ANONYMOUS
+#define MAP_ANONYMOUS MAP_ANON
+#endif  /* ndef MAP_ANONYMOUS */
+#endif  /* ndef HOST_DARWIN */
+
 /*
  * XATTR_AUTO is a synonym for 0 within XattrFlags, but most systems don't
  * define it.  map.c doesn't know that, though, so we ensure that it's defined
@@ -80,7 +94,7 @@
 #define XATTR_AUTO 0
 #endif /* ndef XATTR_AUTO */
 
-#endif /* ndef PLATFORM_WIN32 */
+#endif /* ndef HOST_WIN32 */
 
 typedef    gint64 mph_blkcnt_t;
 typedef    gint64 mph_blksize_t;
@@ -135,6 +149,13 @@ typedef gint64 suseconds_t;
 		return ret; \
 	}}G_STMT_END
 
+#define mph_have_uint_overflow(var) ((var) < 0 || (var) > UINT_MAX)
+
+#define mph_return_val_if_uint_overflow(var, ret) \
+	_mph_return_val_if_cb_(var, ret, mph_have_uint_overflow)
+
+#define mph_return_if_uint_overflow(var) mph_return_val_if_uint_overflow(var, -1)
+
 #define mph_have_long_overflow(var) ((var) > LONG_MAX || (var) < LONG_MIN)
 
 #define mph_return_val_if_long_overflow(var, ret) \
@@ -142,14 +163,14 @@ typedef gint64 suseconds_t;
 
 #define mph_return_if_long_overflow(var) mph_return_val_if_long_overflow(var, -1)
 
-#define mph_have_ulong_overflow(var) ((var) > ULONG_MAX)
+#define mph_have_ulong_overflow(var) (var) < 0 || ((var) > ULONG_MAX)
 
 #define mph_return_val_if_ulong_overflow(var, ret) \
 	_mph_return_val_if_cb_(var, ret, mph_have_ulong_overflow)
 
 #define mph_return_if_ulong_overflow(var) mph_return_val_if_ulong_overflow(var, -1)
 
-#define mph_have_size_t_overflow(var) ((var) > MPH_SIZE_T_MAX)
+#define mph_have_size_t_overflow(var) ((var) < 0 || (var) > MPH_SIZE_T_MAX)
 
 #define mph_return_val_if_size_t_overflow(var, ret) \
 	_mph_return_val_if_cb_(var, ret, mph_have_size_t_overflow)
@@ -171,6 +192,8 @@ typedef gint64 suseconds_t;
 
 #define mph_return_if_time_t_overflow(var) mph_return_if_long_overflow(var)
 
+#define mph_return_if_socklen_t_overflow(var) mph_return_if_uint_overflow(var)
+
 #define mph_return_if_val_in_list5(var,a,b,c,d,e) \
 	do {                                                            \
 		int v = (var);                                                \