Merge remote-tracking branch 'origin/master'

soloud.mod/soloud/src/audiosource/ay/chipplayer.cpp

@@ -1,7 +1,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <memory.h>
-#include <malloc.h>
 #include "chipplayer.h"
 #include "soloud_file.h"
 #include "soloud_ay.h"

soloud.mod/soloud/src/audiosource/ay/sndbuffer.cpp

@@ -1,7 +1,7 @@
 #include "sndbuffer.h"
 #include "sndrender.h"
 
-#include "malloc.h"
+#include "stdlib.h"
 #include "memory.h"
 
 SNDBUFFER::SNDBUFFER(unsigned aSize) {