diff --git a/src/solaris/native/java/util/TimeZone_md.c b/src/solaris/native/java/util/TimeZone_md.c
index 581e2adb21fefa7a9ea9fac1c181a10b7770380c..7e95d5362baf7f2c015af9de7f13f96a071086e9 100644
--- a/src/solaris/native/java/util/TimeZone_md.c
+++ b/src/solaris/native/java/util/TimeZone_md.c
@@ -122,7 +122,8 @@ findZoneinfoFile(char *buf, size_t size, const char *dir)
         return NULL;
     }
 
-#if defined(__linux__) || (defined(__solaris__) && defined(_POSIX_PTHREAD_SEMANTICS))
+#if defined(__linux__) || (defined(__solaris__) && (defined(_POSIX_PTHREAD_SEMANTICS) || \
+                                                    defined(_LP64)))
     while (readdir_r(dirp, entry, &dp) == 0 && dp != NULL) {
 #else
     while ((dp = readdir_r(dirp, entry)) != NULL) {