Merge pull request #1566 from nykytenko/solaris

Solaris: fix readdir for x64 OS.
dlang · May 8, 2016 · 65967a9 · 65967a9
2 parents 8e09c99 + 9ac8554
commit 65967a9
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/core/sys/posix/dirent.d b/src/core/sys/posix/dirent.d
@@ -180,14 +180,22 @@ else version (Solaris)
         char* dd_buf;
     }
 
-    static if (__USE_LARGEFILE64)
+    version (D_LP64)
     {
-        dirent* readdir64(DIR*);
-        alias readdir64 readdir;
+        dirent* readdir(DIR*);
+        alias readdir64 = readdir;
     }
     else
     {
-        dirent* readdir(DIR*);
+        static if (__USE_LARGEFILE64)
+        {
+            dirent* readdir64(DIR*);
+            alias readdir64 readdir;
+        }
+        else
+        {
+            dirent* readdir(DIR*);
+        }
     }
 }
 else version( CRuntime_Bionic )