Skip to content

Commit abe325a

Browse files
RTL-pubRTL-pub
RTL-pub
authored and
RTL-pub
committed
Updating project files and headers
1 parent d8530ce commit abe325a

File tree

11 files changed

+67
-44
lines changed

11 files changed

+67
-44
lines changed

‎VcMake/JDecoder.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@
2525
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2626
<ConfigurationType>StaticLibrary</ConfigurationType>
2727
<CharacterSet>MultiByte</CharacterSet>
28+
<PlatformToolset>v143</PlatformToolset>
2829
</PropertyGroup>
2930
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
3031
<ConfigurationType>StaticLibrary</ConfigurationType>
32+
<PlatformToolset>v143</PlatformToolset>
3133
</PropertyGroup>
3234
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3335
<ImportGroup Label="ExtensionSettings">

‎VcMake/JSON.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@
2727
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2828
<ConfigurationType>StaticLibrary</ConfigurationType>
2929
<CharacterSet>MultiByte</CharacterSet>
30+
<PlatformToolset>v143</PlatformToolset>
3031
</PropertyGroup>
3132
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
3233
<ConfigurationType>StaticLibrary</ConfigurationType>
34+
<PlatformToolset>v143</PlatformToolset>
3335
</PropertyGroup>
3436
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3537
<ImportGroup Label="ExtensionSettings">

‎VcMake/ValFact.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@
2626
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2727
<ConfigurationType>StaticLibrary</ConfigurationType>
2828
<CharacterSet>MultiByte</CharacterSet>
29+
<PlatformToolset>v143</PlatformToolset>
2930
</PropertyGroup>
3031
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
3132
<ConfigurationType>StaticLibrary</ConfigurationType>
33+
<PlatformToolset>v143</PlatformToolset>
3234
</PropertyGroup>
3335
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3436
<ImportGroup Label="ExtensionSettings">

‎VcMake/examples.sln‎

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11

2-
Microsoft Visual Studio Solution File, Format Version 11.00
3-
# Visual Studio 2010
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.4.33213.308
5+
MinimumVisualStudioVersion = 10.0.40219.1
46
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m2mled", "m2mled.vcxproj", "{E3E3815A-82F3-4AC4-BDA1-4D744F7CBDFB}"
57
ProjectSection(ProjectDependencies) = postProject
68
{75262908-FF79-4187-9902-34CD3A887CEB} = {75262908-FF79-4187-9902-34CD3A887CEB}
@@ -42,26 +44,6 @@ Global
4244
{E3E3815A-82F3-4AC4-BDA1-4D744F7CBDFB}.Release|Win32.ActiveCfg = Release|Win32
4345
{E3E3815A-82F3-4AC4-BDA1-4D744F7CBDFB}.Release|Win32.Build.0 = Release|Win32
4446
{E3E3815A-82F3-4AC4-BDA1-4D744F7CBDFB}.Release|x64.ActiveCfg = Release|Win32
45-
{75262908-FF79-4187-9902-34CD3A887CEB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
46-
{75262908-FF79-4187-9902-34CD3A887CEB}.Debug|Mixed Platforms.Build.0 = Debug|Win32
47-
{75262908-FF79-4187-9902-34CD3A887CEB}.Debug|Win32.ActiveCfg = Debug|Win32
48-
{75262908-FF79-4187-9902-34CD3A887CEB}.Debug|Win32.Build.0 = Debug|Win32
49-
{75262908-FF79-4187-9902-34CD3A887CEB}.Debug|x64.ActiveCfg = Debug|Win32
50-
{75262908-FF79-4187-9902-34CD3A887CEB}.Release|Mixed Platforms.ActiveCfg = Release|Win32
51-
{75262908-FF79-4187-9902-34CD3A887CEB}.Release|Mixed Platforms.Build.0 = Release|Win32
52-
{75262908-FF79-4187-9902-34CD3A887CEB}.Release|Win32.ActiveCfg = Release|Win32
53-
{75262908-FF79-4187-9902-34CD3A887CEB}.Release|Win32.Build.0 = Release|Win32
54-
{75262908-FF79-4187-9902-34CD3A887CEB}.Release|x64.ActiveCfg = Release|Win32
55-
{6991B964-4C52-4096-A2E9-F852355ACCCB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
56-
{6991B964-4C52-4096-A2E9-F852355ACCCB}.Debug|Mixed Platforms.Build.0 = Debug|Win32
57-
{6991B964-4C52-4096-A2E9-F852355ACCCB}.Debug|Win32.ActiveCfg = Debug|Win32
58-
{6991B964-4C52-4096-A2E9-F852355ACCCB}.Debug|Win32.Build.0 = Debug|Win32
59-
{6991B964-4C52-4096-A2E9-F852355ACCCB}.Debug|x64.ActiveCfg = Debug|Win32
60-
{6991B964-4C52-4096-A2E9-F852355ACCCB}.Release|Mixed Platforms.ActiveCfg = Release|Win32
61-
{6991B964-4C52-4096-A2E9-F852355ACCCB}.Release|Mixed Platforms.Build.0 = Release|Win32
62-
{6991B964-4C52-4096-A2E9-F852355ACCCB}.Release|Win32.ActiveCfg = Release|Win32
63-
{6991B964-4C52-4096-A2E9-F852355ACCCB}.Release|Win32.Build.0 = Release|Win32
64-
{6991B964-4C52-4096-A2E9-F852355ACCCB}.Release|x64.ActiveCfg = Release|Win32
6547
{45F1316D-58EA-434C-90DD-286FCBA95F31}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
6648
{45F1316D-58EA-434C-90DD-286FCBA95F31}.Debug|Mixed Platforms.Build.0 = Debug|Win32
6749
{45F1316D-58EA-434C-90DD-286FCBA95F31}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -82,6 +64,26 @@ Global
8264
{A7EEDFC3-F122-4568-B804-BD16D8946A2A}.Release|Win32.ActiveCfg = Release|Win32
8365
{A7EEDFC3-F122-4568-B804-BD16D8946A2A}.Release|Win32.Build.0 = Release|Win32
8466
{A7EEDFC3-F122-4568-B804-BD16D8946A2A}.Release|x64.ActiveCfg = Release|Win32
67+
{75262908-FF79-4187-9902-34CD3A887CEB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
68+
{75262908-FF79-4187-9902-34CD3A887CEB}.Debug|Mixed Platforms.Build.0 = Debug|Win32
69+
{75262908-FF79-4187-9902-34CD3A887CEB}.Debug|Win32.ActiveCfg = Debug|Win32
70+
{75262908-FF79-4187-9902-34CD3A887CEB}.Debug|Win32.Build.0 = Debug|Win32
71+
{75262908-FF79-4187-9902-34CD3A887CEB}.Debug|x64.ActiveCfg = Debug|Win32
72+
{75262908-FF79-4187-9902-34CD3A887CEB}.Release|Mixed Platforms.ActiveCfg = Release|Win32
73+
{75262908-FF79-4187-9902-34CD3A887CEB}.Release|Mixed Platforms.Build.0 = Release|Win32
74+
{75262908-FF79-4187-9902-34CD3A887CEB}.Release|Win32.ActiveCfg = Release|Win32
75+
{75262908-FF79-4187-9902-34CD3A887CEB}.Release|Win32.Build.0 = Release|Win32
76+
{75262908-FF79-4187-9902-34CD3A887CEB}.Release|x64.ActiveCfg = Release|Win32
77+
{6991B964-4C52-4096-A2E9-F852355ACCCB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
78+
{6991B964-4C52-4096-A2E9-F852355ACCCB}.Debug|Mixed Platforms.Build.0 = Debug|Win32
79+
{6991B964-4C52-4096-A2E9-F852355ACCCB}.Debug|Win32.ActiveCfg = Debug|Win32
80+
{6991B964-4C52-4096-A2E9-F852355ACCCB}.Debug|Win32.Build.0 = Debug|Win32
81+
{6991B964-4C52-4096-A2E9-F852355ACCCB}.Debug|x64.ActiveCfg = Debug|Win32
82+
{6991B964-4C52-4096-A2E9-F852355ACCCB}.Release|Mixed Platforms.ActiveCfg = Release|Win32
83+
{6991B964-4C52-4096-A2E9-F852355ACCCB}.Release|Mixed Platforms.Build.0 = Release|Win32
84+
{6991B964-4C52-4096-A2E9-F852355ACCCB}.Release|Win32.ActiveCfg = Release|Win32
85+
{6991B964-4C52-4096-A2E9-F852355ACCCB}.Release|Win32.Build.0 = Release|Win32
86+
{6991B964-4C52-4096-A2E9-F852355ACCCB}.Release|x64.ActiveCfg = Release|Win32
8587
{13DF4164-3E75-49F3-A257-64F88265C0C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
8688
{13DF4164-3E75-49F3-A257-64F88265C0C0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
8789
{13DF4164-3E75-49F3-A257-64F88265C0C0}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -96,4 +98,7 @@ Global
9698
GlobalSection(SolutionProperties) = preSolution
9799
HideSolutionNode = FALSE
98100
EndGlobalSection
101+
GlobalSection(ExtensibilityGlobals) = postSolution
102+
SolutionGuid = {5CF7B18E-EF0A-437B-A67C-4AD67C0B143E}
103+
EndGlobalSection
99104
EndGlobal

‎VcMake/m2mled.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2323
<ConfigurationType>Application</ConfigurationType>
2424
<CharacterSet>MultiByte</CharacterSet>
25+
<PlatformToolset>v143</PlatformToolset>
26+
</PropertyGroup>
27+
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
28+
<PlatformToolset>v143</PlatformToolset>
2529
</PropertyGroup>
2630
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
2731
<ImportGroup Label="ExtensionSettings">

‎VcMake/staticalloc.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2222
<ConfigurationType>Application</ConfigurationType>
2323
<CharacterSet>MultiByte</CharacterSet>
24+
<PlatformToolset>v143</PlatformToolset>
25+
</PropertyGroup>
26+
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
27+
<PlatformToolset>v143</PlatformToolset>
2428
</PropertyGroup>
2529
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
2630
<ImportGroup Label="ExtensionSettings">

‎VcMake/test1.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2222
<ConfigurationType>Application</ConfigurationType>
2323
<CharacterSet>MultiByte</CharacterSet>
24+
<PlatformToolset>v143</PlatformToolset>
25+
</PropertyGroup>
26+
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
27+
<PlatformToolset>v143</PlatformToolset>
2428
</PropertyGroup>
2529
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
2630
<ImportGroup Label="ExtensionSettings">

‎inc/BufPrint.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
****************************************************************************
1111
* HEADER
1212
*
13-
* $Id: BufPrint.h 5029 2022-01-16 21:32:09Z wini $
13+
* $Id: BufPrint.h 5355 2022-11-16 10:33:45Z wini $
1414
*
1515
* COPYRIGHT: Real Time Logic LLC, 2008 - 2022
1616
*
@@ -155,7 +155,7 @@ typedef struct BufPrint
155155
/** The printf function's format is identical to the standard
156156
ANSI vprintf function. See BufPrint::printf for the format flags.
157157
\param fmt See vprintf in the
158-
<a href="http://www.infosys.utas.edu.au/info/documentation/C/CStdLib.html#stdio.h">
158+
<a href="../clib.html#stdio.h">
159159
C Standard Library</a> for more information.
160160
\param argList See vprintf in the C Standard Library for
161161
more information.
@@ -171,7 +171,7 @@ typedef struct BufPrint
171171
BufPrint::jsonString
172172
173173
\param fmt See vprintf in the
174-
<a href="../../../StdC/CStdLib.html#stdio.h">
174+
<a href="../clib.html#stdio.h">
175175
C Standard Library</a> for more information.
176176
*/
177177
int printf(const char* fmt, ...);
@@ -304,8 +304,8 @@ inline int BufPrint::printf(const char* fmt, ...) {
304304
}
305305
inline char* BufPrint::getBuf() {
306306
return BufPrint_getBuf(this); }
307-
inline void BufPrint::setBuf(char* buf, int size) {
308-
BufPrint_setBuf(this, buf, size); }
307+
inline void BufPrint::setBuf(char* buffer, int size) {
308+
BufPrint_setBuf(this, buffer, size); }
309309
inline U32 BufPrint::getBufSize() {
310310
return BufPrint_getBufSize(this); }
311311
inline void BufPrint::erase() {

‎inc/JDecoder.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,12 +232,12 @@ inline int JDecoder::vget(const char* fmt, va_list* argList){
232232
return JDecoder_vget(this, fmt, argList);
233233
}
234234
inline int JDecoder::get(const char* fmt, ...){
235-
int status;
235+
int stat;
236236
va_list argList;
237237
va_start(argList, fmt);
238-
status = JDecoder_vget(this, fmt, &argList);
238+
stat = JDecoder_vget(this, fmt, &argList);
239239
va_end(argList);
240-
return status;
240+
return stat;
241241
}
242242
inline JDecoder::JDecoder(U8* buf, int bufSize, int extraStackLen){
243243
JDecoder_constructor(this, buf, bufSize, extraStackLen);

‎inc/JParser.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,8 @@ inline int JErr::setTooFewParams() {
214214
return JErr_setTooFewParams(this);}
215215
inline int JErr::setTypeErr(JVType expT, JVType recT) {
216216
return JErr_setTypeErr(this, expT, recT);}
217-
inline int JErr::setError(JErrT err,const char* msg) {
218-
return JErr_setError(this,err,msg);}
217+
inline int JErr::setError(JErrT e,const char* message) {
218+
return JErr_setError(this,e, message);}
219219
#endif
220220

221221

0 commit comments

Comments
 (0)