made darkplaces able to compile as C++ again, and fixed all conversion warnings when...

[xonotic/darkplaces.git] / sys_sdl.c

diff --git a/sys_sdl.c b/sys_sdl.c
index d18b4b6e18d24dafe8226647e967827d19a2e559..6bbbe382aebd46dbc600d81d45571b6858134590 100644 (file)
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -57,7 +57,7 @@ void Sys_PrintToTerminal(const char *text)
 #endif
        while(*text)
        {
-               int written = (int)write(1, text, strlen(text));
+               int written = (int)write(1, text, (int)strlen(text));
                if(written <= 0)
                        break; // sorry, I cannot do anything about this error - without an output
                text += written;
@@ -176,7 +176,7 @@ char *Sys_GetClipboardData (void)
                {
                        if ((cliptext = GlobalLock (hClipboardData)) != 0)
                        {
-                               data = malloc (GlobalSize(hClipboardData)+1);
+                               data = Z_Malloc (GlobalSize(hClipboardData)+1);
                                strcpy (data, cliptext);
                                GlobalUnlock (hClipboardData);
                        }