From 7961bfc15f6dd423b5088fff1dc983409d810b9b Mon Sep 17 00:00:00 2001
From: Hackerpilot <briancschott@gmail.com>
Date: Mon, 7 Nov 2016 13:18:12 -0800
Subject: [PATCH] #261

---
 libdparse         | 2 +-
 makefile          | 5 ++---
 src/dfmt/tokens.d | 3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libdparse b/libdparse
index 6f98e08..1e24b41 160000
--- a/libdparse
+++ b/libdparse
@@ -1 +1 @@
-Subproject commit 6f98e085edfdabe571fd57164370d3f27f452c52
+Subproject commit 1e24b41392c1363fc52a3d079debde965771be3e
diff --git a/makefile b/makefile
index bd3a7ea..629fdb2 100644
--- a/makefile
+++ b/makefile
@@ -1,7 +1,6 @@
 SRC := $(shell find src -name "*.d") \
-	$(shell find libdparse/src -name "*.d") \
-	$(shell find libdparse/experimental_allocator/src -name "*.d")
-INCLUDE_PATHS := -Ilibdparse/src -Isrc -Ilibdparse/experimental_allocator/src
+	$(shell find libdparse/src -name "*.d")
+INCLUDE_PATHS := -Ilibdparse/src -Isrc
 DMD_COMMON_FLAGS := -dip25 -w $(INCLUDE_PATHS)
 DMD_DEBUG_FLAGS := -g $(DMD_COMMON_FLAGS)
 DMD_FLAGS := -O -inline $(DMD_COMMON_FLAGS)
diff --git a/src/dfmt/tokens.d b/src/dfmt/tokens.d
index ec13172..55b31c6 100644
--- a/src/dfmt/tokens.d
+++ b/src/dfmt/tokens.d
@@ -36,6 +36,7 @@ int tokenLength(ref const Token t) pure @safe @nogc
 {
     import std.algorithm : countUntil;
 
+    int c;
     switch (t.type)
     {
     case tok!"doubleLiteral":
@@ -55,7 +56,7 @@ int tokenLength(ref const Token t) pure @safe @nogc
     case tok!"wstringLiteral":
     case tok!"dstringLiteral":
         // TODO: Unicode line breaks and old-Mac line endings
-        auto c = cast(int) t.text.countUntil('\n');
+        c = cast(int) t.text.countUntil('\n');
         if (c == -1)
             return cast(int) t.text.length;
         else