This commit is contained in:
QL 2018-09-10 12:45:14 -04:00
parent 5e7670bd07
commit 37aa056271
7 changed files with 50 additions and 32 deletions

View File

@ -133,7 +133,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;..;../../../../include;../../../../ports/win32-qv;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>Q_SPY;QWIN_GUI;snprintf=_snprintf;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>Q_SPY;QWIN_GUI;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>false</StringPooling>
<ExceptionHandling>
</ExceptionHandling>

View File

@ -133,7 +133,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;..;../../../../include;../../../../ports/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>Q_SPY;QWIN_GUI;snprintf=_snprintf;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>Q_SPY;QWIN_GUI;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>false</StringPooling>
<ExceptionHandling>
</ExceptionHandling>

View File

@ -93,7 +93,7 @@
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>.;../../../include;../../../ports/win32-qv;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;snprintf=_snprintf;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<ExceptionHandling>
</ExceptionHandling>
@ -122,7 +122,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;../../../include;../../../ports/win32-qv;$(QTOOLS)/qspy/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>Q_SPY;snprintf=_snprintf;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>Q_SPY;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<ExceptionHandling>
</ExceptionHandling>

View File

@ -122,7 +122,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;../../../include;../../../ports/win32;$(QTOOLS)/qspy/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>Q_SPY;snprintf=_snprintf;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>Q_SPY;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<ExceptionHandling>
</ExceptionHandling>

View File

@ -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 <stdio.h> and <string.h> ... */
/* portable "safe" facilities from <stdio.h> and <string.h> */
#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 */

View File

@ -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 <stdio.h> and <string.h> ... */
#ifdef _MSC_VER /* Microsoft C/C++ compiler? */
/* portable "safe" facilities from <stdio.h> and <string.h> */
#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 */

View File

@ -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 <stdio.h> and <string.h> ... */
#ifdef _MSC_VER /* Microsoft C/C++ compiler? */
/* portable "safe" facilities from <stdio.h> and <string.h> */
#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 */