X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=support%2Fmph.h;h=224f01093333f715a3408958c87047673c7b07cf;hb=99e01cc1d7811c4d785014503f0e4d2bf6cca94b;hp=74dab37cb1b809f19f50c5ed7db3a78694a22660;hpb=cccbf6a4b7152c24fafc319e77060a4723a8560e;p=mono.git

diff --git a/support/mph.h b/support/mph.h
index 74dab37cb1b..224f0109333 100644
--- a/support/mph.h
+++ b/support/mph.h
@@ -27,6 +27,7 @@
 
 #include <config.h>
 
+#include <stddef.h>             /* offsetof */
 #include <limits.h>             /* LONG_MAX, ULONG_MAX */
 #include <errno.h>              /* for ERANGE */
 #include <glib.h>               /* for g* types, etc. */
@@ -35,8 +36,6 @@
 #include <stdint.h>             /* for SIZE_MAX */
 #endif
 
-#include "map-icalls.h"
-
 #if __APPLE__ || __BSD__ || __FreeBSD__
 #define MPH_ON_BSD
 #endif
@@ -51,6 +50,38 @@
 #define EOVERFLOW 75
 #endif /* def PLATFORM_WIN32 && ndef EOVERFLOW */
 
+#if !defined (PLATFORM_WIN32)
+
+/* 
+ * Solaris doesn'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
+ */
+
+#ifndef L_SET
+#define L_SET SEEK_SET
+#endif /* ndef L_SET */
+
+#ifndef L_INCR
+#define L_INCR SEEK_CUR
+#endif /* ndef L_INCR */
+
+#ifndef L_XTND
+#define L_XTND SEEK_END
+#endif /* ndef L_XTND */
+
+/*
+ * 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
+ * so that the value 0 round-trips through MonoPosixHelper.
+ */
+
+#ifndef XATTR_AUTO
+#define XATTR_AUTO 0
+#endif /* ndef XATTR_AUTO */
+
+#endif /* ndef PLATFORM_WIN32 */
+
 typedef    gint64 mph_blkcnt_t;
 typedef    gint64 mph_blksize_t;
 typedef   guint64 mph_dev_t;
@@ -67,6 +98,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
@@ -127,6 +171,13 @@ typedef   guint64 mph_fsfilcnt_t;
 
 #define mph_return_if_time_t_overflow(var) mph_return_if_long_overflow(var)
 
+#define mph_return_if_val_in_list5(var,a,b,c,d,e) \
+	do {                                                            \
+		int v = (var);                                                \
+		if (v == a || v == b || v == c || v == d || v == e)           \
+			return -1;                                                  \
+	} while (0)
+
 /*
  * Helper function for functions which use ERANGE (such as getpwnam_r and
  * getgrnam_r).  These functions accept buffers which are dynamically
@@ -148,10 +199,20 @@ recheck_range (int ret)
 	return 0;
 }
 
+typedef unsigned int mph_string_offset_t;
+
+enum {
+	MPH_STRING_OFFSET_PTR   = 0x0,
+	MPH_STRING_OFFSET_ARRAY = 0x1,
+	MPH_STRING_OFFSET_MASK  = 0x1
+};
+
+#define MPH_STRING_OFFSET(type,member,kind) ((offsetof(type,member) << 1) | kind)
+
 MPH_INTERNAL char* 
 _mph_copy_structure_strings (
-	void *to,         const size_t *to_offsets, 
-	const void *from, const size_t *from_offsets, 
+	void *to,         const mph_string_offset_t *to_offsets, 
+	const void *from, const mph_string_offset_t *from_offsets, 
 	size_t num_strings);
 
 #endif /* ndef INC_mph_H */