Merge pull request #1036 from redstar/solaris2

Add more Solaris declarations.
dlang · Nov 22, 2014 · 85e3ad9 · 85e3ad9
2 parents 29cf679 + 8317b77
commit 85e3ad9
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 9 deletions.
diff --git a/src/core/sys/posix/sys/stat.d b/src/core/sys/posix/sys/stat.d
@@ -734,9 +734,21 @@ else version (Solaris)
             gid_t st_gid;
             dev_t st_rdev;
             off_t st_size;
-            timestruc_t st_atim;
-            timestruc_t st_mtim;
-            timestruc_t st_ctim;
+            union
+            {
+                timestruc_t st_atim;
+                time_t      st_atime;
+            }
+            union
+            {
+                timestruc_t st_mtim;
+                time_t      st_mtime;
+            }
+            union
+            {
+                timestruc_t st_ctim;
+                time_t      st_ctime;
+            }
             blksize_t st_blksize;
             blkcnt_t st_blocks;
             char[_ST_FSTYPSZ] st_fstype;
@@ -759,9 +771,21 @@ else version (Solaris)
             c_long[2] st_pad2;
             off_t st_size;
             c_long st_pad3;
-            timestruc_t st_atim;
-            timestruc_t st_mtim;
-            timestruc_t st_ctim;
+            union
+            {
+                timestruc_t st_atim;
+                time_t      st_atime;
+            }
+            union
+            {
+                timestruc_t st_mtim;
+                time_t      st_mtime;
+            }
+            union
+            {
+                timestruc_t st_ctim;
+                time_t      st_ctime;
+            }
             blksize_t st_blksize;
             blkcnt_t st_blocks;
             char[_ST_FSTYPSZ] st_fstype;
@@ -781,9 +805,21 @@ else version (Solaris)
             c_long[2] st_pad2;
             off64_t st_size;
             c_long st_pad3;
-            timestruc_t st_atim;
-            timestruc_t st_mtim;
-            timestruc_t st_ctim;
+            union
+            {
+                timestruc_t st_atim;
+                time_t      st_atime;
+            }
+            union
+            {
+                timestruc_t st_mtim;
+                time_t      st_mtime;
+            }
+            union
+            {
+                timestruc_t st_ctim;
+                time_t      st_ctime;
+            }
             blksize_t st_blksize;
             blkcnt64_t st_blocks;
             char[_ST_FSTYPSZ] st_fstype;

diff --git a/src/core/sys/posix/utime.d b/src/core/sys/posix/utime.d
@@ -65,6 +65,16 @@ else version( FreeBSD )
 
     int utime(in char*, in utimbuf*);
 }
+else version( Solaris )
+{
+    struct utimbuf
+    {
+        time_t  actime;
+        time_t  modtime;
+    }
+
+    int utime(in char*, in utimbuf*);
+}
 else version( Android )
 {
     struct utimbuf