--- old/src/os/solaris/vm/os_solaris.inline.hpp	2017-06-08 14:41:11.235007940 +0200
+++ new/src/os/solaris/vm/os_solaris.inline.hpp	2017-06-08 14:41:11.095007945 +0200
@@ -80,18 +80,15 @@
 
 inline struct dirent* os::readdir(DIR* dirp, dirent* dbuf) {
   assert(dirp != NULL, "just checking");
-#if defined(_LP64) || defined(_GNU_SOURCE) || _FILE_OFFSET_BITS==64
   dirent* p;
   int status;
 
   if((status = ::readdir_r(dirp, dbuf, &p)) != 0) {
     errno = status;
     return NULL;
-  } else
+  } else {
     return p;
-#else  // defined(_LP64) || defined(_GNU_SOURCE) || _FILE_OFFSET_BITS==64
-  return ::readdir_r(dirp, dbuf);
-#endif // defined(_LP64) || defined(_GNU_SOURCE) || _FILE_OFFSET_BITS==64
+  }
 }
 
 inline int os::closedir(DIR *dirp) {