FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Another attempt to make MSVC happy!

Browse Source 
C89 requires variable declarations upfront.
This commit is contained in:
James Turner
2013-10-09 12:26:29 +02:00
parent 426c6b9a72
commit 9e3172cb04
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/nasal/mathlib.c
+5 -2
View File
@@ -155,14 +155,17 @@ static naRef f_round(naContext c, naRef me, int argc, naRef* args)
{ {
naRef a = naNumValue(argc > 0 ? args[0] : naNil()); naRef a = naNumValue(argc > 0 ? args[0] : naNil());
naRef b = naNumValue(argc > 1 ? args[1] : naNil()); naRef b = naNumValue(argc > 1 ? args[1] : naNil());
#ifdef _MSC_VER
double x,y;
#endif
if(naIsNil(a)) if(naIsNil(a))
naRuntimeError(c, "non numeric arguments to round()"); naRuntimeError(c, "non numeric arguments to round()");
if (naIsNil(b)) if (naIsNil(b))
b.num = 1.0; b.num = 1.0;
#ifdef _MSC_VER // MSVC is not C99-compatible, no round() in math.h #ifdef _MSC_VER // MSVC is not C99-compatible, no round() in math.h
double y = a.num / b.num; y = a.num / b.num;
double x = floor(y + 0.5); x = floor(y + 0.5);
#else #else
double x = round(a.num / b.num); double x = round(a.num / b.num);
#endif #endif