From 14b74386372440df590bc62b28b68f2341425add Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Tue, 7 Feb 2006 18:36:54 +0000 Subject: [PATCH] Fixes for Visual C++ 6.0 --- VisualC.zip | Bin 38392 -> 38405 bytes include/SDL_types.h | 4 +++- include/SDL_windows.h | 1 + src/stdlib/SDL_stdlib.c | 4 ++++ src/video/e_pow.h | 2 +- src/video/e_sqrt.h | 2 +- 6 files changed, 10 insertions(+), 3 deletions(-) diff --git a/VisualC.zip b/VisualC.zip index b456339211cd7ac67d99f1ec7e710b03dc571241..c7a8ab20cd023d857634053d1686a1fa9aa612e3 100644 GIT binary patch delta 3073 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 #ifdef _MSC_VER -#include /* For size_t */ +/* FIXME!! */ +typedef unsigned int size_t; +typedef size_t uintptr_t; #endif /* The number of elements in an array */ diff --git a/include/SDL_windows.h b/include/SDL_windows.h index f33fadffc..dff14d0c5 100644 --- a/include/SDL_windows.h +++ b/include/SDL_windows.h @@ -24,6 +24,7 @@ #define _SDL_windows_h #include "SDL_config.h" +#include "SDL_types.h" /* This includes only the windows headers needed by SDL, with no C runtime */ #define WIN32_LEAN_AND_MEAN diff --git a/src/stdlib/SDL_stdlib.c b/src/stdlib/SDL_stdlib.c index cb255b688..4e7e7b13c 100644 --- a/src/stdlib/SDL_stdlib.c +++ b/src/stdlib/SDL_stdlib.c @@ -31,6 +31,10 @@ #if defined(_MSC_VER) /* Float to long (FIXME!) */ +long _ftol() +{ + return 0; +} long _ftol2_sse() { return 0; diff --git a/src/video/e_pow.h b/src/video/e_pow.h index 0d6505f0b..e9a5b1659 100644 --- a/src/video/e_pow.h +++ b/src/video/e_pow.h @@ -130,7 +130,7 @@ ivln2_l = 1.92596299112661746887e-08; /* 0x3E54AE0B, 0xF85DDF44 =1/ln2 tail*/ k = (iy>>20)-0x3ff; /* exponent */ if(k>20) { j = ly>>(52-k); - if((j<<(52-k))==ly) yisint = 2-(j&1); + if((u_int32_t)(j<<(52-k))==ly) yisint = 2-(j&1); } else if(ly==0) { j = iy>>(20-k); if((j<<(20-k))==iy) yisint = 2-(j&1); diff --git a/src/video/e_sqrt.h b/src/video/e_sqrt.h index e5dc1fe16..9a019b087 100644 --- a/src/video/e_sqrt.h +++ b/src/video/e_sqrt.h @@ -202,7 +202,7 @@ static char rcsid[] = "$NetBSD: e_sqrt.c,v 1.8 1995/05/10 20:46:17 jtc Exp $"; t = s0; if((t