From b81b7eada6e43ee254caf42b0704fabf840e526e Mon Sep 17 00:00:00 2001
From: Johan Engelen <jbc.engelen@gmail.com>
Date: Wed, 25 Oct 2017 11:34:37 +0200
Subject: [PATCH 1/2] Add "D_betterC" version.

Cherry-pick from upstream DMD, https://github.com/dlang/dmd/pull/7132
---
 driver/main.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/driver/main.cpp b/driver/main.cpp
index 4630f8e65d9..5d1e190e0a0 100644
--- a/driver/main.cpp
+++ b/driver/main.cpp
@@ -916,6 +916,10 @@ void registerPredefinedVersions() {
     VersionCondition::addPredefinedGlobalIdent("D_NoBoundsChecks");
   }
 
+  if (global.params.betterC) {
+    VersionCondition::addPredefinedGlobalIdent("D_betterC");
+  }
+
   registerPredefinedTargetVersions();
 
   // `D_ObjectiveC` is added by the ddmd.objc.Supported ctor

From e2ea17156672863ff4be3ef1e03c286f8ecdf038 Mon Sep 17 00:00:00 2001
From: kinke <kinke@users.noreply.github.com>
Date: Thu, 26 Oct 2017 21:45:05 +0200
Subject: [PATCH 2/2] rename

---
 driver/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/driver/main.cpp b/driver/main.cpp
index 5d1e190e0a0..e7c39bf8e58 100644
--- a/driver/main.cpp
+++ b/driver/main.cpp
@@ -917,7 +917,7 @@ void registerPredefinedVersions() {
   }
 
   if (global.params.betterC) {
-    VersionCondition::addPredefinedGlobalIdent("D_betterC");
+    VersionCondition::addPredefinedGlobalIdent("D_BetterC");
   }
 
   registerPredefinedTargetVersions();