Merge pull request #1747 from MartinNowak/merge_stable

Merge remote-tracking branch 'upstream/stable' into merge_stable
merged-on-behalf-of: Martin Nowak <code@dawg.eu>

src/core/stdc/stdlib.d

@@ -157,11 +157,11 @@ else
 // functions using these already have to be @trusted, allowing them to
 // call @system stuff anyway.
 ///
-void*   malloc(size_t size) pure;
+void*   malloc(size_t size);
 ///
-void*   calloc(size_t nmemb, size_t size) pure;
+void*   calloc(size_t nmemb, size_t size);
 ///
-void*   realloc(void* ptr, size_t size) pure;
+void*   realloc(void* ptr, size_t size);
 ///
 void    free(void* ptr);
 

src/core/sys/posix/iconv.d

@@ -35,7 +35,7 @@ iconv_t iconv_open (in char* tocode, in char* fromcode);
 /// Convert at most *INBYTESLEFT bytes from *INBUF according to the
 /// code conversion algorithm specified by CD and place up to
 /// *OUTBYTESLEFT bytes in buffer at *OUTBUF.
-size_t iconv (iconv_t cd, char** inbuf,
+size_t iconv (iconv_t cd, in char** inbuf,
          size_t* inbytesleft,
          char** outbuf,
          size_t* outbytesleft);

src/core/sys/posix/stdlib.d

@@ -122,42 +122,42 @@ version( CRuntime_Glibc )
     int setenv(in char*, in char*, int);
     int unsetenv(in char*);
 
-    void* valloc(size_t) pure; // LEGACY non-standard
+    void* valloc(size_t); // LEGACY non-standard
 }
 else version( Darwin )
 {
     int setenv(in char*, in char*, int);
     int unsetenv(in char*);
 
-    void* valloc(size_t) pure; // LEGACY non-standard
+    void* valloc(size_t); // LEGACY non-standard
 }
 else version( FreeBSD )
 {
     int setenv(in char*, in char*, int);
     int unsetenv(in char*);
 
-    void* valloc(size_t) pure; // LEGACY non-standard
+    void* valloc(size_t); // LEGACY non-standard
 }
 else version( OpenBSD )
 {
     int setenv(in char*, in char*, int);
     int unsetenv(in char*);
 
-    void* valloc(size_t) pure; // LEGACY non-standard
+    void* valloc(size_t); // LEGACY non-standard
 }
 else version( CRuntime_Bionic )
 {
     int setenv(in char*, in char*, int);
     int unsetenv(in char*);
 
-    void* valloc(size_t) pure;
+    void* valloc(size_t);
 }
 else version( Solaris )
 {
     int setenv(in char*, in char*, int);
     int unsetenv(in char*);
 
-    void* valloc(size_t) pure; // LEGACY non-standard
+    void* valloc(size_t); // LEGACY non-standard
 }
 
 //

src/rt/monitor_.d

@@ -155,11 +155,6 @@ version (Windows)
     {
         pragma(lib, "snn.lib");
     }
-    else version (CRuntime_Microsoft)
-    {
-        pragma(lib, "libcmt.lib");
-        pragma(lib, "oldnames.lib");
-    }
     import core.sys.windows.windows;
 
     alias Mutex = CRITICAL_SECTION;

win64.mak

@@ -28,6 +28,9 @@ DRUNTIME_BASE=druntime$(MODEL)
 DRUNTIME=lib\$(DRUNTIME_BASE).lib
 GCSTUB=lib\gcstub$(MODEL).obj
 
+# do not preselect a C runtime (extracted from the line above to make the auto tester happy)
+CFLAGS=$(CFLAGS) /Zl
+
 DOCFMT=
 
 target : import copydir copy $(DRUNTIME) $(GCSTUB)