Merge pull request #2244 from ibuclaw/sigeventsize

dlang-bot · web-flow · commit c97beb8a1b67 · 2018-07-17T16:01:35.000+02:00
core.sys.posix.signal: Fix size of sigevent and siginfo_t on 64bit.
merged-on-behalf-of: Sebastian Wilzbach &lt;sebi.wilzbach@gmail.com&gt;
diff --git a/src/core/sys/posix/signal.d b/src/core/sys/posix/signal.d
@@ -941,7 +941,7 @@ version( CRuntime_Glibc )
 
     private enum __SI_MAX_SIZE = 128;
 
-    static if( false /* __WORDSIZE == 64 */ )
+    static if( __WORDSIZE == 64 )
     {
         private enum __SI_PAD_SIZE = ((__SI_MAX_SIZE / int.sizeof) - 4);
     }
@@ -1740,7 +1740,7 @@ else version( CRuntime_UClibc )
 
     private enum __SI_MAX_SIZE = 128;
 
-    static if( false /* __WORDSIZE == 64 */ )
+    static if( __WORDSIZE == 64 )
     {
         private enum __SI_PAD_SIZE = ((__SI_MAX_SIZE / int.sizeof) - 4);
     }
@@ -3450,7 +3450,7 @@ version( CRuntime_Glibc )
 {
     private enum __SIGEV_MAX_SIZE = 64;
 
-    static if( false /* __WORDSIZE == 64 */ )
+    static if( __WORDSIZE == 64 )
     {
         private enum __SIGEV_PAD_SIZE = ((__SIGEV_MAX_SIZE / int.sizeof) - 4);
     }
@@ -3611,7 +3611,7 @@ else version( CRuntime_UClibc )
 {
     private enum __SIGEV_MAX_SIZE = 64;
 
-    static if( false /* __WORDSIZE == 64 */ )
+    static if( __WORDSIZE == 64 )
     {
         private enum __SIGEV_PAD_SIZE = ((__SIGEV_MAX_SIZE / int.sizeof) - 4);
     }

Original file line number	Diff line number	Diff line change
`@@ -941,7 +941,7 @@ version( CRuntime_Glibc )`
`941`	`941`
`942`	`942`	`private enum __SI_MAX_SIZE = 128;`
`943`	`943`
`944`		`- static if( false /* __WORDSIZE == 64 */ )`
	`944`	`+ static if( __WORDSIZE == 64 )`
`945`	`945`	`{`
`946`	`946`	`private enum __SI_PAD_SIZE = ((__SI_MAX_SIZE / int.sizeof) - 4);`
`947`	`947`	`}`
`@@ -1740,7 +1740,7 @@ else version( CRuntime_UClibc )`
`1740`	`1740`
`1741`	`1741`	`private enum __SI_MAX_SIZE = 128;`
`1742`	`1742`
`1743`		`- static if( false /* __WORDSIZE == 64 */ )`
	`1743`	`+ static if( __WORDSIZE == 64 )`
`1744`	`1744`	`{`
`1745`	`1745`	`private enum __SI_PAD_SIZE = ((__SI_MAX_SIZE / int.sizeof) - 4);`
`1746`	`1746`	`}`
`@@ -3450,7 +3450,7 @@ version( CRuntime_Glibc )`
`3450`	`3450`	`{`
`3451`	`3451`	`private enum __SIGEV_MAX_SIZE = 64;`
`3452`	`3452`
`3453`		`- static if( false /* __WORDSIZE == 64 */ )`
	`3453`	`+ static if( __WORDSIZE == 64 )`
`3454`	`3454`	`{`
`3455`	`3455`	`private enum __SIGEV_PAD_SIZE = ((__SIGEV_MAX_SIZE / int.sizeof) - 4);`
`3456`	`3456`	`}`
`@@ -3611,7 +3611,7 @@ else version( CRuntime_UClibc )`
`3611`	`3611`	`{`
`3612`	`3612`	`private enum __SIGEV_MAX_SIZE = 64;`
`3613`	`3613`
`3614`		`- static if( false /* __WORDSIZE == 64 */ )`
	`3614`	`+ static if( __WORDSIZE == 64 )`
`3615`	`3615`	`{`
`3616`	`3616`	`private enum __SIGEV_PAD_SIZE = ((__SIGEV_MAX_SIZE / int.sizeof) - 4);`
`3617`	`3617`	`}`