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 0947d573048613a189b52f9ba41df3681284e4db..e399d3f8878fad9d8f3e103c36082920bb3c282a 100644 (file)
--- a/src/compiler/dmd/trace.d
+++ b/src/compiler/dmd/trace.d
@@ -661,7 +661,7 @@ static char* trace_readline(FILE* fp)
             default:
                 break;
         }
             default:
                 break;
         }

-        buf[i] = c;
+        buf[i] = cast(char)c;

         i++;
     }
 L1:
         i++;
     }
 L1:

diff --git a/src/compiler/dmd/util/string.d b/src/compiler/dmd/util/string.d
index d63a5a1e1cfd5d5113a002127e3cf21bb10c3f7e..5f49fe6a5b02bf0b8474148afe09c1cb98aae80a 100644 (file)
--- 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[] intToString( char[] buf, uint val )
 {
     assert( buf.length > 9 );

-    char* p = buf.ptr + buf.length;
+    auto p = buf.ptr + buf.length;

 
     do
     {
 
     do
     {

-        *--p = val % 10 + '0';
+        *--p = cast(char)(val % 10 + '0');

     } while( val /= 10 );
 
     return buf[p - buf.ptr .. $];
     } while( val /= 10 );
 
     return buf[p - buf.ptr .. $];

diff --git a/src/dmd-win32.mak b/src/dmd-win32.mak
index e2798f52e2ff9d1d077f8c0fa71968808360d8ec..2693489e1cb1d820a8b2654765b815181c9c524e 100644 (file)
--- 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:
 # 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 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
 
 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 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)"
        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)
 
 doc : $(ALL_DOCS)
        cd $(DIR_CC)

-       make -fwin32.mak doc
+       make -fwin32.mak doc DC=$(DC)

        cd ..
        cd $(DIR_RT)
        cd ..
        cd $(DIR_RT)

-       make -fwin32.mak doc
+       make -fwin32.mak doc DC=$(DC)

        cd ..\..
        cd $(DIR_GC)
        cd ..\..
        cd $(DIR_GC)

-       make -fwin32.mak doc
+       make -fwin32.mak doc DC=$(DC)

        cd ..\..
 
 ######################################################
        cd ..\..
 
 ######################################################