From 37aa056271d1cb242a2cc986ef8d237d0498642d Mon Sep 17 00:00:00 2001 From: QL Date: Mon, 10 Sep 2018 12:45:14 -0400 Subject: [PATCH] 6.3.4a --- .../win32-qv/dpp-gui.vcxproj | 2 +- .../win32/dpp-gui.vcxproj | 2 +- examples/win32-qv/dpp/dpp.vcxproj | 4 +-- examples/win32/dpp/dpp.vcxproj | 2 +- ports/win32-qutest/qf_port.h | 23 ++++++++++------ ports/win32-qv/qf_port.h | 26 +++++++++++-------- ports/win32/qf_port.h | 23 ++++++++++------ 7 files changed, 50 insertions(+), 32 deletions(-) diff --git a/examples/arm-cm/dpp_efm32-slstk3401a/win32-qv/dpp-gui.vcxproj b/examples/arm-cm/dpp_efm32-slstk3401a/win32-qv/dpp-gui.vcxproj index 6819c394..b5b0f94f 100644 --- a/examples/arm-cm/dpp_efm32-slstk3401a/win32-qv/dpp-gui.vcxproj +++ b/examples/arm-cm/dpp_efm32-slstk3401a/win32-qv/dpp-gui.vcxproj @@ -133,7 +133,7 @@ Disabled .;..;../../../../include;../../../../ports/win32-qv;%(AdditionalIncludeDirectories) - Q_SPY;QWIN_GUI;snprintf=_snprintf;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + Q_SPY;QWIN_GUI;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) false diff --git a/examples/arm-cm/dpp_efm32-slstk3401a/win32/dpp-gui.vcxproj b/examples/arm-cm/dpp_efm32-slstk3401a/win32/dpp-gui.vcxproj index 1174700f..3e8b8639 100644 --- a/examples/arm-cm/dpp_efm32-slstk3401a/win32/dpp-gui.vcxproj +++ b/examples/arm-cm/dpp_efm32-slstk3401a/win32/dpp-gui.vcxproj @@ -133,7 +133,7 @@ Disabled .;..;../../../../include;../../../../ports/win32;%(AdditionalIncludeDirectories) - Q_SPY;QWIN_GUI;snprintf=_snprintf;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + Q_SPY;QWIN_GUI;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) false diff --git a/examples/win32-qv/dpp/dpp.vcxproj b/examples/win32-qv/dpp/dpp.vcxproj index a1411309..3889418e 100644 --- a/examples/win32-qv/dpp/dpp.vcxproj +++ b/examples/win32-qv/dpp/dpp.vcxproj @@ -93,7 +93,7 @@ MaxSpeed true .;../../../include;../../../ports/win32-qv;%(AdditionalIncludeDirectories) - NDEBUG;snprintf=_snprintf;WIN32;_CONSOLE;%(PreprocessorDefinitions) + NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) false @@ -122,7 +122,7 @@ Disabled .;../../../include;../../../ports/win32-qv;$(QTOOLS)/qspy/include;%(AdditionalIncludeDirectories) - Q_SPY;snprintf=_snprintf;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + Q_SPY;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false diff --git a/examples/win32/dpp/dpp.vcxproj b/examples/win32/dpp/dpp.vcxproj index 28db311d..2f95ea1a 100644 --- a/examples/win32/dpp/dpp.vcxproj +++ b/examples/win32/dpp/dpp.vcxproj @@ -122,7 +122,7 @@ Disabled .;../../../include;../../../ports/win32;$(QTOOLS)/qspy/include;%(AdditionalIncludeDirectories) - Q_SPY;snprintf=_snprintf;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + Q_SPY;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false diff --git a/ports/win32-qutest/qf_port.h b/ports/win32-qutest/qf_port.h index 08c78e57..8de05c7f 100644 --- a/ports/win32-qutest/qf_port.h +++ b/ports/win32-qutest/qf_port.h @@ -1,14 +1,15 @@ /** * @file * @brief QF/C "port" for QUTEST unit test harness, Win32 with GNU or VisualC++ +* @ingroup qutest * @cond ****************************************************************************** -* Last Updated for Version: 6.2.0 -* Date of the Last Update: 2018-03-12 +* Last Updated for Version: 6.3.4 +* Date of the Last Update: 2018-09-04 * -* Q u a n t u m L e a P s -* --------------------------- -* innovating embedded systems +* Q u a n t u m L e a P s +* ------------------------ +* Modern Embedded Software * * Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. * @@ -69,8 +70,14 @@ /* interrupt nesting up-down counter */ extern uint8_t volatile QF_intNest; -#ifdef _MSC_VER /* Microsoft C/C++ compiler? */ -/* define portable "safe" facilities from and ... */ +/* portable "safe" facilities from and */ +#ifdef _MSC_VER /* Microsoft Visual C++ */ + +#if (_MSC_VER < 1900) /* before Visual Studio 2015 */ + +#define snprintf _snprintf + +#endif #define SNPRINTF_S(buf_, len_, format_, ...) \ _snprintf_s(buf_, len_, _TRUNCATE, format_, ##__VA_ARGS__) @@ -105,7 +112,7 @@ extern uint8_t volatile QF_intNest; #define SSCANF_S(buf_, format_, ...) \ sscanf(buf_, format_, ##__VA_ARGS__) -#endif /* _MSC_VER */ +#endif /****************************************************************************/ /* interface used only inside QF implementation, but not in applications */ diff --git a/ports/win32-qv/qf_port.h b/ports/win32-qv/qf_port.h index 79956b0c..19acb973 100644 --- a/ports/win32-qv/qf_port.h +++ b/ports/win32-qv/qf_port.h @@ -1,14 +1,15 @@ /** * @file * @brief QF/C port to Win32 with cooperative QV kernel (win32-qv) +* @ingroup ports * @cond ****************************************************************************** -* Last Updated for Version: 6.2.0 -* Date of the Last Update: 2018-04-09 +* Last Updated for Version: 6.3.4 +* Date of the Last Update: 2018-09-04 * -* Q u a n t u m L e a P s -* --------------------------- -* innovating embedded systems +* Q u a n t u m L e a P s +* ------------------------ +* Modern Embedded Software * * Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. * @@ -89,8 +90,14 @@ void QF_onClockTick(void); /* clock tick callback (provided in the app) */ int_t main_gui(); /* prototype of the GUI application entry point */ #endif -/* portable "safe" facilities from and ... */ -#ifdef _MSC_VER /* Microsoft C/C++ compiler? */ +/* portable "safe" facilities from and */ +#ifdef _MSC_VER /* Microsoft Visual C++ */ + +#if (_MSC_VER < 1900) /* before Visual Studio 2015 */ + +#define snprintf _snprintf + +#endif #define SNPRINTF_S(buf_, len_, format_, ...) \ _snprintf_s(buf_, len_, _TRUNCATE, format_, ##__VA_ARGS__) @@ -125,10 +132,7 @@ void QF_onClockTick(void); /* clock tick callback (provided in the app) */ #define SSCANF_S(buf_, format_, ...) \ sscanf(buf_, format_, ##__VA_ARGS__) -#define SSCANF_S(buf_, format_, ...) \ - sscanf(buf_, format_, ##__VA_ARGS__) - -#endif /* _MSC_VER */ +#endif /****************************************************************************/ /* interface used only inside QF implementation, but not in applications */ diff --git a/ports/win32/qf_port.h b/ports/win32/qf_port.h index 26a53f0c..5173067f 100644 --- a/ports/win32/qf_port.h +++ b/ports/win32/qf_port.h @@ -1,14 +1,15 @@ /** * @file * @brief QF/C port to Win32 API +* @ingroup ports * @cond ****************************************************************************** -* Last Updated for Version: 6.1.1 -* Date of the Last Update: 2018-03-06 +* Last Updated for Version: 6.3.4 +* Date of the Last Update: 2018-09-04 * -* Q u a n t u m L e a P s -* --------------------------- -* innovating embedded systems +* Q u a n t u m L e a P s +* ------------------------ +* Modern Embedded Software * * Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. * @@ -93,8 +94,14 @@ void QF_onClockTick(void); int_t main_gui(); /* prototype of the GUI application entry point */ #endif -/* portable "safe" facilities from and ... */ -#ifdef _MSC_VER /* Microsoft C/C++ compiler? */ +/* portable "safe" facilities from and */ +#ifdef _MSC_VER /* Microsoft Visual C++ */ + +#if (_MSC_VER < 1900) /* before Visual Studio 2015 */ + +#define snprintf _snprintf + +#endif #define SNPRINTF_S(buf_, len_, format_, ...) \ _snprintf_s(buf_, len_, _TRUNCATE, format_, ##__VA_ARGS__) @@ -129,7 +136,7 @@ void QF_onClockTick(void); #define SSCANF_S(buf_, format_, ...) \ sscanf(buf_, format_, ##__VA_ARGS__) -#endif /* _MSC_VER */ +#endif /****************************************************************************/ /* interface used only inside QF implementation, but not in applications */