From 75b2ef9372d9bc469b33a66a680e6f529d769d6c Mon Sep 17 00:00:00 2001 From: James Turner Date: Tue, 31 May 2016 13:40:00 +0100 Subject: [PATCH 1/3] Fix VS2015 compilation --- simgear/package/untar.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/simgear/package/untar.cxx b/simgear/package/untar.cxx index ee8b7178..7698029d 100644 --- a/simgear/package/untar.cxx +++ b/simgear/package/untar.cxx @@ -22,6 +22,7 @@ #include #include #include +#include #include From 34e804b78403a6fecc61d7db052d7abfb6490ef7 Mon Sep 17 00:00:00 2001 From: James Turner Date: Tue, 31 May 2016 13:40:32 +0100 Subject: [PATCH 2/3] Fix VS2015 compilation --- 3rdparty/udns/udns.h | 1 + 1 file changed, 1 insertion(+) diff --git a/3rdparty/udns/udns.h b/3rdparty/udns/udns.h index 371e6976..44880ba6 100644 --- a/3rdparty/udns/udns.h +++ b/3rdparty/udns/udns.h @@ -45,6 +45,7 @@ #endif #include /* for time_t */ +#include #ifdef __cplusplus extern "C" { From be4ebddb60ad53b0636f735ec80586bdc11fe83c Mon Sep 17 00:00:00 2001 From: James Turner Date: Tue, 31 May 2016 13:41:28 +0100 Subject: [PATCH 3/3] Fix for VS2015 compilation --- simgear/compiler.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/simgear/compiler.h b/simgear/compiler.h index 0f0c8347..ebaa7eb4 100644 --- a/simgear/compiler.h +++ b/simgear/compiler.h @@ -43,7 +43,7 @@ # if __GNUC__ < 3 # error Time to upgrade. GNU compilers < 3.0 not supported # elif (__GNUC__ == 3) && (__GNUC_MINOR__ < 4) -# warning GCC compilers prior to 3.4 are suspect +# warning GCC compilers prior to 3.4 are suspect # endif # define SG_GCC_VERSION (__GNUC__ * 10000 \ @@ -66,8 +66,8 @@ # if _MSC_VER >= 1200 // msvc++ 6.0 up to MSVC2013 # if _MSC_VER < 1800 # define isnan _isnan +# define snprintf _snprintf # endif -# define snprintf _snprintf # if _MSC_VER < 1500 # define vsnprintf _vsnprintf # endif @@ -203,4 +203,3 @@ inline int (isnan)(double r) { return !(r <= 0 || r >= 0); } // #endif // _SG_COMPILER_H -