Fix sys.types definitions for Linux X32.

src/core/stdc/time.d

@@ -55,8 +55,15 @@ else
     }
 }
 
-alias c_long time_t;
-alias c_long clock_t;
+version ( Posix )
+{
+    public import core.sys.posix.sys.types : time_t, clock_t;
+}
+else
+{
+    alias c_long time_t;
+    alias c_long clock_t;
+}
 
 version( Windows )
 {

src/core/sys/posix/sys/types.d

@@ -18,11 +18,45 @@ module core.sys.posix.sys.types;
 private import core.sys.posix.config;
 private import core.stdc.stdint;
 public import core.stdc.stddef; // for size_t
-public import core.stdc.time;   // for clock_t, time_t
 
 version (Posix):
 extern (C):
 
+//
+// bits/typesizes.h -- underlying types for *_t.
+//
+/*
+__syscall_slong_t
+__syscall_ulong_t
+*/
+version (linux)
+{
+    version (X86_64)
+    {
+        version (D_X32)
+        {
+            // X32 kernel interface is 64-bit.
+            alias long slong_t;
+            alias ulong ulong_t;
+        }
+        else
+        {
+            alias c_long slong_t;
+            alias c_ulong ulong_t;
+        }
+    }
+    else
+    {
+        alias c_long slong_t;
+        alias c_ulong ulong_t;
+    }
+}
+else
+{
+    alias c_long slong_t;
+    alias c_ulong ulong_t;
+}
+
 //
 // Required
 //
@@ -52,19 +86,19 @@ version( linux )
   }
   else
   {
-    alias c_long    blkcnt_t;
-    alias c_ulong   ino_t;
-    alias c_long    off_t;
+    alias slong_t   blkcnt_t;
+    alias ulong_t   ino_t;
+    alias slong_t   off_t;
   }
-    alias c_long    blksize_t;
+    alias slong_t   blksize_t;
     alias ulong     dev_t;
     alias uint      gid_t;
     alias uint      mode_t;
-    alias c_ulong   nlink_t;
+    alias ulong_t   nlink_t;
     alias int       pid_t;
     //size_t (defined in core.stdc.stddef)
     alias c_long    ssize_t;
-    //time_t (defined in core.stdc.time)
+    alias slong_t   time_t;
     alias uint      uid_t;
 }
 else version( OSX )
@@ -80,7 +114,7 @@ else version( OSX )
     alias int       pid_t;
     //size_t (defined in core.stdc.stddef)
     alias c_long    ssize_t;
-    //time_t (defined in core.stdc.time)
+    alias c_long    time_t;
     alias uint      uid_t;
 }
 else version( FreeBSD )
@@ -96,7 +130,7 @@ else version( FreeBSD )
     alias int       pid_t;
     //size_t (defined in core.stdc.stddef)
     alias c_long    ssize_t;
-    //time_t (defined in core.stdc.time)
+    alias c_long    time_t;
     alias uint      uid_t;
     alias uint      fflags_t;
 }
@@ -139,6 +173,7 @@ else version (Solaris)
     alias uint nlink_t;
     alias int pid_t;
     alias c_long ssize_t;
+    alias c_long time_t;
     alias uint uid_t;
 }
 else
@@ -168,30 +203,30 @@ version( linux )
   }
   else
   {
-    alias c_ulong   fsblkcnt_t;
-    alias c_ulong   fsfilcnt_t;
+    alias ulong_t   fsblkcnt_t;
+    alias ulong_t   fsfilcnt_t;
   }
-    // clock_t (defined in core.stdc.time)
+    alias slong_t   clock_t;
     alias uint      id_t;
     alias int       key_t;
-    alias c_long    suseconds_t;
+    alias slong_t   suseconds_t;
     alias uint      useconds_t;
 }
 else version( OSX )
 {
-    //clock_t
-    alias uint  fsblkcnt_t;
-    alias uint  fsfilcnt_t;
-    alias uint  id_t;
+    alias uint   fsblkcnt_t;
+    alias uint   fsfilcnt_t;
+    alias c_long clock_t;
+    alias uint   id_t;
     // key_t
-    alias int   suseconds_t;
-    alias uint  useconds_t;
+    alias int    suseconds_t;
+    alias uint   useconds_t;
 }
 else version( FreeBSD )
 {
-    // clock_t (defined in core.stdc.time)
     alias ulong     fsblkcnt_t;
     alias ulong     fsfilcnt_t;
+    alias c_long    clock_t;
     alias long      id_t;
     alias c_long    key_t;
     alias c_long    suseconds_t;
@@ -210,6 +245,7 @@ else version (Solaris)
         alias c_ulong fsfilcnt_t;
     }
 
+    alias c_long clock_t;
     alias int id_t;
     alias int key_t;
     alias c_long suseconds_t;