Portability fixes

diff --git a/simgear/nasal/lib.c b/simgear/nasal/lib.c
index 440faaa6a4277ed477cd5389115310b7893d2a2f..1ed3837bd6549fbd400d361c87f7177e48218576 100644 (file)
--- a/simgear/nasal/lib.c
+++ b/simgear/nasal/lib.c
@@ -1,5 +1,6 @@
 #include "nasal.h"
 
+#ifndef _MSC_VER
 // No need to include <string.h> just for this:
 static int strlen(char* s)
 {
@@ -7,6 +8,7 @@ static int strlen(char* s)
     while(*s) s++;
     return s - s0;
 }
+#endif
 
 static naRef size(naContext c, naRef args)
 {

diff --git a/simgear/nasal/mathlib.c b/simgear/nasal/mathlib.c
index 07f8ef81dba63f056899fea113cde5930dc114bf..d967ceedd3cffc66d2e6ac6f3511799ca99e7c45 100644 (file)
--- a/simgear/nasal/mathlib.c
+++ b/simgear/nasal/mathlib.c
@@ -1,3 +1,7 @@
+#ifdef _MSC_VER
+#define _USE_MATH_DEFINES
+#endif
+
 #include <math.h>
 #include <string.h>
 

diff --git a/simgear/nasal/parse.c b/simgear/nasal/parse.c
index 22cfed485c4ee2e777c1a0f97ff2b9638e66164d..a17452c49c707a9760ef5b99489a84422d51b79b 100644 (file)
--- a/simgear/nasal/parse.c
+++ b/simgear/nasal/parse.c
@@ -107,7 +107,7 @@ void* naParseAlloc(struct Parser* p, int bytes)
         p->leftInChunk = sz;
     }
 
-    result = p->chunks[0] + p->chunkSizes[0] - p->leftInChunk;
+    result = (char *)p->chunks[0] + p->chunkSizes[0] - p->leftInChunk;
     p->leftInChunk -= bytes;
     return (void*)result;
 }