core.stdc.fenv: standardize version() statements

dlang · Feb 4, 2015 · e7b00f9 · e7b00f9
1 parent 61e8d3a
commit e7b00f9
Showing 1 changed file with 11 additions and 22 deletions.
diff --git a/src/core/stdc/fenv.d b/src/core/stdc/fenv.d
@@ -24,10 +24,6 @@ version( MinGW )
 version( linux )
     version = GNUFP;
 
-version( DigitalMars )
-    version( Win32 )
-        version = DMC_RUNTIME;
-
 version( GNUFP )
 {
     // https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/x86/fpu/bits/fenv.h
@@ -114,7 +110,7 @@ version( GNUFP )
         static assert(0, "Unimplemented architecture");
     }
 }
-else version( DMC_RUNTIME )
+else version( CRuntime_DigitalMars )
 {
     struct fenv_t
     {
@@ -125,9 +121,8 @@ else version( DMC_RUNTIME )
     }
     alias fexcept_t = int;
 }
-else version( Windows )
+else version( CRuntime_Microsoft )
 {
-    // MSVCRT
     struct fenv_t
     {
         uint ctl;
@@ -231,28 +226,22 @@ enum
     FE_TOWARDZERO   = 0xC00, ///
 }
 
-version( DMC_RUNTIME )
+version( GNUFP )
 {
-    private extern __gshared fenv_t _FE_DFL_ENV;
     ///
-    enum fenv_t* FE_DFL_ENV = &_FE_DFL_ENV;
+    enum FE_DFL_ENV = cast(fenv_t*)(-1);
 }
-else version( Windows )
+else version( CRuntime_DigitalMars )
 {
-    version( MinGW )
-        ///
-        enum FE_DFL_ENV = cast(fenv_t*)(-1);
-    else
-    {
-        private immutable fenv_t _Fenv0 = {0, 0};
-        ///
-        enum FE_DFL_ENV = &_Fenv0;
-    }
+    private extern __gshared fenv_t _FE_DFL_ENV;
+    ///
+    enum fenv_t* FE_DFL_ENV = &_FE_DFL_ENV;
 }
-else version( linux )
+else version( CRuntime_Microsoft )
 {
+    private immutable fenv_t _Fenv0 = {0, 0};
     ///
-    enum FE_DFL_ENV = cast(fenv_t*)(-1);
+    enum FE_DFL_ENV = &_Fenv0;
 }
 else version( OSX )
 {