From: walter <walter@4a9d5153-6564-4b3f-b5e1-7e8e9dac548f>
Date: Sun, 12 Oct 2008 01:53:37 +0000 (+0000)
Subject: fix it so it compiles
X-Git-Url: https://git.llucax.com/software/druntime.git/commitdiff_plain/3400935b4d614573a221bed9eebb2308f09a4695?ds=sidebyside

fix it so it compiles

git-svn-id: http://svn.dsource.org/projects/druntime/trunk@20 4a9d5153-6564-4b3f-b5e1-7e8e9dac548f
---

diff --git a/src/compiler/dmd/trace.d b/src/compiler/dmd/trace.d
index 0947d57..e399d3f 100644
--- a/src/compiler/dmd/trace.d
+++ b/src/compiler/dmd/trace.d
@@ -661,7 +661,7 @@ static char* trace_readline(FILE* fp)
             default:
                 break;
         }
-        buf[i] = c;
+        buf[i] = cast(char)c;
         i++;
     }
 L1:
diff --git a/src/compiler/dmd/util/string.d b/src/compiler/dmd/util/string.d
index d63a5a1..5f49fe6 100644
--- a/src/compiler/dmd/util/string.d
+++ b/src/compiler/dmd/util/string.d
@@ -13,11 +13,11 @@ private import stdc.string;
 char[] intToString( char[] buf, uint val )
 {
     assert( buf.length > 9 );
-    char* p = buf.ptr + buf.length;
+    auto p = buf.ptr + buf.length;
 
     do
     {
-        *--p = val % 10 + '0';
+        *--p = cast(char)(val % 10 + '0');
     } while( val /= 10 );
 
     return buf[p - buf.ptr .. $];
diff --git a/src/dmd-win32.mak b/src/dmd-win32.mak
index e2798f5..2693489 100644
--- a/src/dmd-win32.mak
+++ b/src/dmd-win32.mak
@@ -1,14 +1,14 @@
 # Makefile to build the composite D runtime library for Win32
 # Designed to work with DigitalMars make
 # Targets:
-#	make
-#		Same as make all
-#	make lib
-#		Build the runtime library
+#   make
+#       Same as make all
+#   make lib
+#       Build the runtime library
 #   make doc
 #       Generate documentation
-#	make clean
-#		Delete unneeded files created by build process
+#   make clean
+#       Delete unneeded files created by build process
 
 LIB_TARGET=druntime-dmd.lib
 LIB_MASK=druntime-dmd*.lib
@@ -52,7 +52,7 @@ lib : $(ALL_OBJS)
 	make -fwin32.mak lib DC=$(DC) ADD_DFLAGS="$(ADD_DFLAGS)" ADD_CFLAGS="$(ADD_CFLAGS)"
 	cd ..
 	cd $(DIR_RT)
-	make -fwin32.mak lib
+	make -fwin32.mak lib DC=$(DC)
 	cd ..\..
 	cd $(DIR_GC)
 	make -fwin32.mak lib DC=$(DC) ADD_DFLAGS="$(ADD_DFLAGS)" ADD_CFLAGS="$(ADD_CFLAGS)"
@@ -62,13 +62,13 @@ lib : $(ALL_OBJS)
 
 doc : $(ALL_DOCS)
 	cd $(DIR_CC)
-	make -fwin32.mak doc
+	make -fwin32.mak doc DC=$(DC)
 	cd ..
 	cd $(DIR_RT)
-	make -fwin32.mak doc
+	make -fwin32.mak doc DC=$(DC)
 	cd ..\..
 	cd $(DIR_GC)
-	make -fwin32.mak doc
+	make -fwin32.mak doc DC=$(DC)
 	cd ..\..
 
 ######################################################