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 3833fdad9308fec02e1e6d0419fd78f077205a35..6bbbe382aebd46dbc600d81d45571b6858134590 100644 (file)
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -1,5 +1,6 @@
 
 #ifdef WIN32
+#include <io.h>
 #include "conio.h"
 #else
 #include <unistd.h>
@@ -56,7 +57,7 @@ void Sys_PrintToTerminal(const char *text)
 #endif
        while(*text)
        {
-               ssize_t written = 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;
@@ -175,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);
                        }