Mercurial > hg > truffle
diff src/os/solaris/vm/os_solaris.inline.hpp @ 11198:1e6d5dec4a4e
Merge.
| author | Christian Humer <christian.humer@gmail.com> |
|---|---|
| date | Mon, 05 Aug 2013 13:20:06 +0200 |
| parents | feae15578b2f |
| children | 6c9332549827 ce8f6bb717c9 |
line wrap: on
line diff
--- a/src/os/solaris/vm/os_solaris.inline.hpp Thu Aug 01 21:34:57 2013 +0200 +++ b/src/os/solaris/vm/os_solaris.inline.hpp Mon Aug 05 13:20:06 2013 +0200 @@ -89,7 +89,7 @@ inline struct dirent* os::readdir(DIR* dirp, dirent* dbuf) { assert(dirp != NULL, "just checking"); -#if defined(_LP64) || defined(_GNU_SOURCE) +#if defined(_LP64) || defined(_GNU_SOURCE) || _FILE_OFFSET_BITS==64 dirent* p; int status; @@ -98,9 +98,9 @@ return NULL; } else return p; -#else // defined(_LP64) || defined(_GNU_SOURCE) +#else // defined(_LP64) || defined(_GNU_SOURCE) || _FILE_OFFSET_BITS==64 return ::readdir_r(dirp, dbuf); -#endif // defined(_LP64) || defined(_GNU_SOURCE) +#endif // defined(_LP64) || defined(_GNU_SOURCE) || _FILE_OFFSET_BITS==64 } inline int os::closedir(DIR *dirp) {