This works for me, works on Windows according to MSDN and should also work

[xonotic/darkplaces.git] / sys_win.c

diff --git a/sys_win.c b/sys_win.c
index d3da31c087af20c990d4bfd87f6a19a7b2b37e5e..69387dccadfc6515d9c3b67d426cc222014a2f06 100644 (file)
--- a/sys_win.c
+++ b/sys_win.c
@@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 #include <windows.h>
+#include <mmsystem.h>
 #include <dsound.h>
 #include "errno.h"
 #include "resource.h"
@@ -286,7 +287,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);
                        }
@@ -316,7 +317,7 @@ void Sys_InitConsole (void)
                hinput = GetStdHandle (STD_INPUT_HANDLE);
                houtput = GetStdHandle (STD_OUTPUT_HANDLE);
 
-#ifdef WIN64
+#ifdef _WIN64
 #define atoi _atoi64
 #endif
        // give QHOST a chance to hook into the console