Merge pull request #4111 from joakim-noah/add_glibc

Add predefined global version for Glibc
dlang · Dec 1, 2014 · e17631e · e17631e
2 parents ab5dbd5 + b5a9ca0
commit e17631e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/samples/chello.d b/samples/chello.d
@@ -19,7 +19,7 @@ import core.stdc.stdio;
 import core.stdc.stdlib;
 import std.string;
 import core.sys.windows.windows;
-import std.c.windows.com;
+import core.sys.windows.com;
 
 GUID CLSID_Hello = { 0x30421140, 0, 0, [0xC0, 0, 0, 0, 0, 0, 0, 0x46] };
 GUID IID_IHello  = { 0x00421140, 0, 0, [0xC0, 0, 0, 0, 0, 0, 0, 0x46] };

diff --git a/samples/dclient.d b/samples/dclient.d
@@ -16,7 +16,7 @@
 import core.stdc.stdio;
 import core.stdc.stdlib;
 import core.sys.windows.windows;
-import std.c.windows.com;
+import core.sys.windows.com;
 
 GUID CLSID_Hello = { 0x30421140, 0, 0, [0xC0, 0, 0, 0, 0, 0, 0, 0x46] };
 GUID IID_IHello  = { 0x00421140, 0, 0, [0xC0, 0, 0, 0, 0, 0, 0, 0x46] };

diff --git a/samples/dserver.d b/samples/dserver.d
@@ -19,7 +19,7 @@ import core.stdc.stdlib;
 import core.stdc.string;
 import std.string;
 import core.sys.windows.windows;
-import std.c.windows.com;
+import core.sys.windows.com;
 
 import chello;
 

diff --git a/src/cond.c b/src/cond.c
@@ -215,6 +215,9 @@ bool VersionCondition::isPredefined(const char *ident)
         "BigEndian",
         "ELFv1",
         "ELFv2",
+        "CRuntime_Digitalmars",
+        "CRuntime_Glibc",
+        "CRuntime_Microsoft",
         "D_Coverage",
         "D_Ddoc",
         "D_InlineAsm_X86",

diff --git a/src/mars.c b/src/mars.c
@@ -1141,7 +1141,7 @@ Language changes listed by -transition=id:\n\
     }
     else
     {
-        VersionCondition::addPredefinedGlobalIdent("D_InlineAsm");
+        VersionCondition::addPredefinedGlobalIdent("D_InlineAsm"); //legacy
         VersionCondition::addPredefinedGlobalIdent("D_InlineAsm_X86");
         VersionCondition::addPredefinedGlobalIdent("X86");
 #if TARGET_OSX
@@ -1162,8 +1162,8 @@ Language changes listed by -transition=id:\n\
         VersionCondition::addPredefinedGlobalIdent("CRuntime_Microsoft");
     else
         VersionCondition::addPredefinedGlobalIdent("CRuntime_DigitalMars");
-#else
-    VersionCondition::addPredefinedGlobalIdent("CRuntime_GNU");
+#elif TARGET_LINUX
+    VersionCondition::addPredefinedGlobalIdent("CRuntime_Glibc");
 #endif
     if (global.params.isLP64)
         VersionCondition::addPredefinedGlobalIdent("D_LP64");