From 80444aefd94c61ea19734d914433c16f854e1baa 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 --HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401349 --- 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 zcmZve2{e@JAIE22l6||xpcv6mmaKymGIJUG8d(}kt}RQ=wZ~Ypj$wF+kR?j?G%l57 zD}_V-O;ki#QplDWzJy$Xu2hA4`NlIc(SwxP^0 z(lI4j3u7i`cG%8Cur|mrlqBX&f70Iz2*6-4)*V1K&Rwv7l?4X7pbUfk1`~vx@g@Yh zUeH&x#+d9Zh4X|!TN^eQ(@vJ1^{dQ${&>K!hCo}Z`Rw+4_chmi_2PN;`O3+%177hg z0)h|x%Z)NFa;_V?5f7mDE!4GoqICHOYOCIrHPgz1g9_*Ig+)d0s9X_d;j!^n-8hWH zW?IChc75ekH#G^ch!AUV5WKBiADRu=FipiIM3(e zZq9*T28S0isrI3@u8)pmAVxPu&I%sRP zJP?jVG~hn`&ivG1>d9>9kDRiVxb|`fA1QI#44+tAxKy`oVWO0KFB zKJC|XtM$B(#3ko;x#0btd`R8Dq1JxpsmaIXynDr26|~9?fm^B3WY(`QW68CJtS;-v z^{&+2Ze3dMb{`y4okWEJyPh9BWmaz0WK|G*5qo5*XEWN182YZ45O9CuPWIjlxMlTR8<7~+KbyC z9>p)mdA3+KjdP$QABd=nB8_{NhWj;<*?4^P2mBesQcM3_3~Hs4N^{M3I=1k&Kfmme zqIzjaW(->{G3zww)o^&6LE}eOeE#(2z;%gT@yxEU z+G^2s6W-#6YNGTLTFS@0tFk|FQ}umfzE0U>Is{;R&`-;Pm#@84NH?t6$4#3N7q>O3 zf9F%=jFG~*dM{t*HN$PZdeP4rOxv0{*+)W(Q1bTU7X7x+R)nT4GB+SW2zdXy7`>OL-S=A3cW#n1f_mS})CkeEuj{p#Nw2u{cwZvBBcU?1x=sH+@kWb-f}nldN?Su# zpG5cdKhty`zN$eg4!kB6FaE(`NieBFy%at%~XzpB%t8fDqMFle4i{=8N ztDW9AsUhvBbfa1s3*S<4*Vb~^*iK0u*Vc5` ze&k6E>k537p;SrA-nO4M5yMTkmJtgtWp_m<}!HW^lp*qmiuGOSgvju z#|+ee<(P5VDT2ze)BGiB&r0O@L*8b34j9D}Y0^%4opSTG@9Udc?evO%tm|^t(c0=! z7ZM$#U45osS_TogFJ3Hvtzk3rZMk7Z=&Br*q#|d1_oloXp9%lyfby_C?RFYTKgCiD zNva?3z(2Hi=z3!0d%{1{)h&i#Fd3whfT)F`<%21W5jMVam+bjfk3TN+swjuYmjtbkUHWWrZv~Em zmAtvGD+`A;!@Hy-5sn76*L4(JHV^gJo=>Eni$N@YXZK_uagXQ<$GguNM{~+g8Eul$ z2)j{rkJOQA5Lx`~ib=5~V%bVz=`9wEOn=RppEyIr@hRrSrby;akTtkbS>vM)m46XC zG+@#>66g_KR{N|G%KT{00k3k;4b5R2;z{#6@@H8z5IRK;F{v#oW61f>lo3PtpZSfH zey^}&?{D6@)bMTNdDO!P(ogyDXOB8}*$#zF%c?aE^CP%5(lPZHl51DNEuFRgk)fmu zWS2Xd5<^N{(YMja?>Fx>e5;DMZ$D@3z*K)waPS%@?_i<{+f1$5O4PHO`GaB+ekwiw z#`R@MMU^7LKQG0U%l0=mUm6DlV|XnESK*xhyo`ah zkSQH16T&dl)o0N{rhh|M#r6KZF)40OXLTeLng8tym$KM(0Ue3MfWwHJx-G@eNGvFO zm6`XS)puqEFh&vvGvgEBhbWdDDe~09F7PrSpJ69M9k9pmG?AGAbN31A8iTThZUe zZeDF`bp{x0m$?TNaI&Sh;^%aO(TaK~imK(xz6Z4MaHNBE9#wz$e3%;J!?g#@^S7b* zs2=J~bqsjN_}-@oS$n{-5IRUz5B;6dU-adCh7ylSVf-F7u`NtY1ZxA}mvCH?K5fBZ z7RGQ$i0Qv3Hqe?Nw=6c^$q7r<-H$@G83Y4T+z!O19 z3IfzhaRFhH8q_PZ8?hiG076J=P_X>2nXk+SdP!*L@h|fLP)I!qg(@?=qM#sE4eC}0 z(PUvTmx_k?(IA>E0Wf4OxD6nZ&p}%{yQqZjKCn(!gRr{0W^o!jFikrN?ZYxm4CIL0 zl^bbVP$^v+rDLE8)7@R8baudF#tK46D8QY`4NnGol!Jhcf`$(PJ&HRdWw(n}Td@Lj zyPXrDz!rs@>6If4C^-p(BN=EWq|=U;1<4s|@E*{b;SBM5>;^@9umY`2H01ot6ayh7 zJ|IS62ahsEARZqEB>*6x1$P1zAPVdO8eR@401saROTY~(4%vmcLs@`-78;uSWeS29 lS!$5-Wrmj*9LqilO+@dSQQ6v1VC=4ZkuAw0ldv=5{~ti)OG^L% delta 3029 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 qP1c1ZgMl*{0S>1bKm%dBWPF-7bT(pF=0`Ar=` #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