diff options
| author | Jonathan Pryor <jpryor@novell.com> | 2006-11-08 18:12:06 +0300 |
|---|---|---|
| committer | Jonathan Pryor <jpryor@novell.com> | 2006-11-08 18:12:06 +0300 |
| commit | 8061464a5017fce1c6bbece4d2a4379bb495c655 (patch) | |
| tree | e3be2a759f0d082bf6fd2c9b64fb945e4c5062f0 /support | |
| parent | a7fa1e7330006e6f527e1e12be24013c820d1fe2 (diff) | |
* Makefile.am: Revert addition of L_SET et al; this breaks the Win32 build.
* map.c: Revert addition of L_SET et al; this breaks the Win32 build.
* mph.h: Add macros for L_SET, L_INCR, and L_XTND for non-Win32 platforms.
svn path=/trunk/mono/; revision=67536
Diffstat (limited to 'support')
| -rw-r--r-- | support/ChangeLog | 6 | ||||
| -rw-r--r-- | support/Makefile.am | 3 | ||||
| -rw-r--r-- | support/map.c | 12 | ||||
| -rw-r--r-- | support/mph.h | 22 |
4 files changed, 28 insertions, 15 deletions
diff --git a/support/ChangeLog b/support/ChangeLog index ca5b5373a9e..a20cad85967 100644 --- a/support/ChangeLog +++ b/support/ChangeLog @@ -1,3 +1,9 @@ +2006-11-08 Jonathan Pryor <jonpryor@vt.edu> + + * Makefile.am: Revert addition of L_SET et al; this breaks the Win32 build. + * map.c: Revert addition of L_SET et al; this breaks the Win32 build. + * mph.h: Add macros for L_SET, L_INCR, and L_XTND for non-Win32 platforms. + 2006-11-07 Jonathan Pryor <jonpryor@vt.edu> * Makefile.am: Add implementation macros for L_SET, L_INCR, and L_XTND. diff --git a/support/Makefile.am b/support/Makefile.am index 2f1aca0b4ca..015136550a0 100644 --- a/support/Makefile.am +++ b/support/Makefile.am @@ -114,9 +114,6 @@ refresh: --impl-header="<dirent.h>" \ --impl-header="<utime.h>" \ --impl-header="\"mph.h\"" \ - --impl-macro="L_SET=SEEK_SET" \ - --impl-macro="L_INCR=SEEK_CUR" \ - --impl-macro="L_XTND=SEEK_END" \ --rename-member=st_atime=st_atime_ \ --rename-member=st_ctime=st_ctime_ \ --rename-member=st_mtime=st_mtime_ \ diff --git a/support/map.c b/support/map.c index fdc6b004fd2..2de79065541 100644 --- a/support/map.c +++ b/support/map.c @@ -21,18 +21,6 @@ #define _XOPEN_SOURCE #endif /* ndef _XOPEN_SOURCE */ -#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 */ - /* * Implementation Includes diff --git a/support/mph.h b/support/mph.h index 14458a03479..7c7705e958b 100644 --- a/support/mph.h +++ b/support/mph.h @@ -49,6 +49,28 @@ #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 */ + +#endif /* ndef PLATFORM_WIN32 */ + typedef gint64 mph_blkcnt_t; typedef gint64 mph_blksize_t; typedef guint64 mph_dev_t; |