diff --git a/appveyor.yml b/appveyor.yml index 1bf716e..86fc235 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,15 +6,23 @@ environment: matrix: + - VSVERSION: Visual Studio 9 2008 - VSVERSION: Visual Studio 10 2010 - VSVERSION: Visual Studio 11 2012 - VSVERSION: Visual Studio 12 2013 - VSVERSION: Visual Studio 14 2015 + - VSVERSION: Visual Studio 15 2017 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 platform: - Win32 - x64 +matrix: + exclude: + - platform: x64 + VSVERSION: Visual Studio 9 2008 + configuration: - Debug - RelWithDebInfo diff --git a/appveyor.yml b/appveyor.yml index 1bf716e..86fc235 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,15 +6,23 @@ environment: matrix: + - VSVERSION: Visual Studio 9 2008 - VSVERSION: Visual Studio 10 2010 - VSVERSION: Visual Studio 11 2012 - VSVERSION: Visual Studio 12 2013 - VSVERSION: Visual Studio 14 2015 + - VSVERSION: Visual Studio 15 2017 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 platform: - Win32 - x64 +matrix: + exclude: + - platform: x64 + VSVERSION: Visual Studio 9 2008 + configuration: - Debug - RelWithDebInfo diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index b911fba..f135355 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -33,6 +33,7 @@ main.c test.c test.cpp + stdint_include.c ) if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") diff --git a/appveyor.yml b/appveyor.yml index 1bf716e..86fc235 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,15 +6,23 @@ environment: matrix: + - VSVERSION: Visual Studio 9 2008 - VSVERSION: Visual Studio 10 2010 - VSVERSION: Visual Studio 11 2012 - VSVERSION: Visual Studio 12 2013 - VSVERSION: Visual Studio 14 2015 + - VSVERSION: Visual Studio 15 2017 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 platform: - Win32 - x64 +matrix: + exclude: + - platform: x64 + VSVERSION: Visual Studio 9 2008 + configuration: - Debug - RelWithDebInfo diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index b911fba..f135355 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -33,6 +33,7 @@ main.c test.c test.cpp + stdint_include.c ) if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") diff --git a/test/stdint_include.c b/test/stdint_include.c new file mode 100644 index 0000000..439c960 --- /dev/null +++ b/test/stdint_include.c @@ -0,0 +1,32 @@ +/* + This is free and unencumbered software released into the public domain. + + Anyone is free to copy, modify, publish, use, compile, sell, or + distribute this software, either in source code form or as a compiled + binary, for any purpose, commercial or non-commercial, and by any + means. + + In jurisdictions that recognize copyright laws, the author or authors + of this software dedicate any and all copyright interest in the + software to the public domain. We make this dedication for the benefit + of the public at large and to the detriment of our heirs and + successors. We intend this dedication to be an overt act of + relinquishment in perpetuity of all present and future rights to this + software under copyright law. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR + OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + + For more information, please refer to +*/ + +#if defined(_MSC_VER) && (_MSC_VER >= 1600) +#include +#endif + +#include "utest.h" diff --git a/appveyor.yml b/appveyor.yml index 1bf716e..86fc235 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,15 +6,23 @@ environment: matrix: + - VSVERSION: Visual Studio 9 2008 - VSVERSION: Visual Studio 10 2010 - VSVERSION: Visual Studio 11 2012 - VSVERSION: Visual Studio 12 2013 - VSVERSION: Visual Studio 14 2015 + - VSVERSION: Visual Studio 15 2017 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 platform: - Win32 - x64 +matrix: + exclude: + - platform: x64 + VSVERSION: Visual Studio 9 2008 + configuration: - Debug - RelWithDebInfo diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index b911fba..f135355 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -33,6 +33,7 @@ main.c test.c test.cpp + stdint_include.c ) if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") diff --git a/test/stdint_include.c b/test/stdint_include.c new file mode 100644 index 0000000..439c960 --- /dev/null +++ b/test/stdint_include.c @@ -0,0 +1,32 @@ +/* + This is free and unencumbered software released into the public domain. + + Anyone is free to copy, modify, publish, use, compile, sell, or + distribute this software, either in source code form or as a compiled + binary, for any purpose, commercial or non-commercial, and by any + means. + + In jurisdictions that recognize copyright laws, the author or authors + of this software dedicate any and all copyright interest in the + software to the public domain. We make this dedication for the benefit + of the public at large and to the detriment of our heirs and + successors. We intend this dedication to be an overt act of + relinquishment in perpetuity of all present and future rights to this + software under copyright law. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR + OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + + For more information, please refer to +*/ + +#if defined(_MSC_VER) && (_MSC_VER >= 1600) +#include +#endif + +#include "utest.h" diff --git a/utest.h b/utest.h index 38aed08..bff4a0d 100644 --- a/utest.h +++ b/utest.h @@ -50,8 +50,8 @@ #endif #if defined(_MSC_VER) -#define int64_t __int64 -#define uint64_t unsigned __int64 +typedef __int64 int64_t; +typedef unsigned __int64 uint64_t; #else #include #endif