Restore compilability with ltsmaster

ldc-developers · Feb 17, 2022 · ba97305 · ba97305
1 parent a9877cb
commit ba97305
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/dmd/common/file.d b/dmd/common/file.d
@@ -18,8 +18,11 @@ import core.stdc.errno : errno;
 import core.stdc.stdio : fprintf, remove, rename, stderr;
 import core.stdc.stdlib : exit;
 import core.stdc.string : strerror;
-import core.sys.windows.winbase;
-import core.sys.windows.winnt;
+version (Windows) // IN_LLVM: ltsmaster...
+{
+    import core.sys.windows.winbase;
+    import core.sys.windows.winnt;
+}
 import core.sys.posix.fcntl;
 import core.sys.posix.unistd;
 

diff --git a/dmd/common/string.d b/dmd/common/string.d
@@ -67,7 +67,7 @@ struct SmallBuffer(T)
     }
 
     // Force accesses to extent to be scoped.
-    scope inout extent()
+    /* ltsmaster: scope */ inout extent()
     {
         return _extent;
     }

diff --git a/dmd/func.d b/dmd/func.d
@@ -3332,7 +3332,7 @@ private bool traverseIndirections(Type ta, Type tb)
 {
     //printf("traverseIndirections(%s, %s)\n", ta.toChars(), tb.toChars());
 
-    static bool traverse(Type ta, Type tb, ref scope AssocArray!(const(char)*, bool) table, bool reversePass)
+    static bool traverse(Type ta, Type tb, ref /* ltsmaster: scope */ AssocArray!(const(char)*, bool) table, bool reversePass)
     {
         //printf("traverse(%s, %s)\n", ta.toChars(), tb.toChars());
         ta = ta.baseElemOf();

diff --git a/dmd/root/array.d b/dmd/root/array.d
@@ -1103,7 +1103,7 @@ pure nothrow @safe unittest
 }
 
 /// Implements the range interface primitive `popFront` for built-in arrays.
-void popFront(T)(/*scope*/ ref inout(T)[] array) pure nothrow @nogc @safe
+void popFront(T)(/* ltsmaster: scope */ ref inout(T)[] array) pure nothrow @nogc @safe
 {                // does not compile with GDC 9 if this is `scope`
     assert(array.length, "Attempting to popFront() past the end of an array of " ~ T.stringof);
     array = array[1 .. $];