some win64 fixes from Willis

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6080 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_screen.c b/cl_screen.c
index afcf2f7cade77fae6d56bcaf3fd793cb43dcd2ec..74cfdc69950df707761a0f7415701a32ff8172f4 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -514,7 +514,7 @@ void R_TimeReport(char *desc)
        t = (int) ((r_timereport_current - r_timereport_temp) * 1000000.0);
 
        dpsnprintf(tempbuf, sizeof(tempbuf), "%8i %-11s", t, desc);
        t = (int) ((r_timereport_current - r_timereport_temp) * 1000000.0);
 
        dpsnprintf(tempbuf, sizeof(tempbuf), "%8i %-11s", t, desc);

-       length = strlen(tempbuf);
+       length = (int)strlen(tempbuf);

        if (speedstringcount + length > (vid_conwidth.integer / 8))
        {
                strlcat(r_speeds_string, "\n", sizeof(r_speeds_string));
        if (speedstringcount + length > (vid_conwidth.integer / 8))
        {
                strlcat(r_speeds_string, "\n", sizeof(r_speeds_string));

diff --git a/snd_mem.c b/snd_mem.c
index 20d9c6b75f4d4900146540977766d4e87af1a991..16b6e17663b9d588d9fbe0ee5bd428ef5917fadc 100644 (file)
--- a/snd_mem.c
+++ b/snd_mem.c
@@ -82,8 +82,8 @@ size_t ResampleSfx (const unsigned char *in_data, size_t in_length, const snd_fo
                // also to be able to handle very long sounds.
                while (total_out < outcount)
                {
                // also to be able to handle very long sounds.
                while (total_out < outcount)
                {

-                       size_t tmpcount, i, j;
-                       unsigned int interpolation_limit, srcsample;
+                       size_t tmpcount, interpolation_limit, i, j;
+                       unsigned int srcsample;

 
                        samplefrac = 0;
 
 
                        samplefrac = 0;
 

diff --git a/vid_sdl.c b/vid_sdl.c
index 258bd8e50181a05b65a82c7dce6ceb373e234b8b..6f59ad305cadc81915fb604ba7f2b8db0431f09f 100644 (file)
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -346,11 +346,13 @@ static void VID_SetCaption()
                return;
 
        icon = LoadIcon( GetModuleHandle( NULL ), MAKEINTRESOURCE( IDI_ICON1 ) );
                return;
 
        icon = LoadIcon( GetModuleHandle( NULL ), MAKEINTRESOURCE( IDI_ICON1 ) );

-#ifndef WIN64
-       SetClassLong( info.window, GCL_HICON, (LONG) icon );
-#else
-       SetClassLongPtr( info.window, GCLP_HICON, (LONG_PTR)icon );
+#ifndef SetClassLongPtr
+#define SetClassLongPtr SetClassLong

 #endif
 #endif

+#ifndef GCLP_HICON
+#define GCLP_HICON GCL_HICON
+#endif
+       SetClassLongPtr( info.window, GCLP_HICON, (LONG_PTR)icon );

 }
 #else
 static void VID_SetCaption()
 }
 #else
 static void VID_SetCaption()