Merge SVN 5253

OCamlPro · Feb 14, 2025 · 314a2a7 · 314a2a7
1 parent 6786028
commit 314a2a7
Show file tree

Hide file tree

Showing 17 changed files with 50 additions and 8 deletions.
diff --git a/build_windows/ChangeLog.txt b/build_windows/ChangeLog.txt
@@ -8,6 +8,10 @@
 	* makedist.cmd: cater for new different library names
 	* version_cobc.rc, version_libcob.rc: updated date + rev
 
+2024-05-14  David Declerck <[email protected]>
+
+	* general for libcob: add missing profiling.c
+
 2023-07-07  Simon Sobisch <[email protected]>
 
 	* general for cobc: include new replace.c

diff --git a/build_windows/ocide/libcob.dll.cpj b/build_windows/ocide/libcob.dll.cpj
@@ -58,6 +58,7 @@
 				<FILE NAME="..\..\libcob\mlio.c" TITLE="mlio.c" CLEAN="0"/>
 				<FILE NAME="..\..\libcob\move.c" TITLE="move.c" CLEAN="0"/>
 				<FILE NAME="..\..\libcob\numeric.c" TITLE="numeric.c" CLEAN="0"/>
+				<FILE NAME="..\..\libcob\profiling.c" TITLE="profiling.c" CLEAN="0"/>
 				<FILE NAME="..\..\libcob\reportio.c" TITLE="reportio.c" CLEAN="0"/>
 				<FILE NAME="..\..\libcob\screenio.c" TITLE="screenio.c" CLEAN="0"/>
 				<FILE NAME="..\..\libcob\strings.c" TITLE="strings.c" CLEAN="0"/>

diff --git a/build_windows/vs2008/libcob.vcproj b/build_windows/vs2008/libcob.vcproj
@@ -261,6 +261,10 @@
 				RelativePath="..\..\libcob\numeric.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\libcob\profiling.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\libcob\reportio.c"
 				>

diff --git a/build_windows/vs2010/libcob.vcxproj b/build_windows/vs2010/libcob.vcxproj
@@ -187,6 +187,7 @@
     <ClCompile Include="..\..\libcob\mlio.c" />
     <ClCompile Include="..\..\libcob\move.c" />
     <ClCompile Include="..\..\libcob\numeric.c" />
+    <ClCompile Include="..\..\libcob\profiling.c" />
     <ClCompile Include="..\..\libcob\reportio.c" />
     <ClCompile Include="..\..\libcob\screenio.c" />
     <ClCompile Include="..\..\libcob\strings.c" />

diff --git a/build_windows/vs2010/libcob.vcxproj.filters b/build_windows/vs2010/libcob.vcxproj.filters
@@ -81,6 +81,9 @@
     <ClCompile Include="..\..\libcob\cobcapi.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\libcob\profiling.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\config.h">
@@ -129,4 +132,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/build_windows/vs2012/libcob.vcxproj b/build_windows/vs2012/libcob.vcxproj
@@ -189,6 +189,7 @@
     <ClCompile Include="..\..\libcob\mlio.c" />
     <ClCompile Include="..\..\libcob\move.c" />
     <ClCompile Include="..\..\libcob\numeric.c" />
+    <ClCompile Include="..\..\libcob\profiling.c" />
     <ClCompile Include="..\..\libcob\reportio.c" />
     <ClCompile Include="..\..\libcob\screenio.c" />
     <ClCompile Include="..\..\libcob\strings.c" />

diff --git a/build_windows/vs2012/libcob.vcxproj.filters b/build_windows/vs2012/libcob.vcxproj.filters
@@ -81,6 +81,9 @@
     <ClCompile Include="..\..\libcob\cobcapi.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\libcob\profiling.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\config.h">
@@ -129,4 +132,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/build_windows/vs2013/libcob.vcxproj b/build_windows/vs2013/libcob.vcxproj
@@ -190,6 +190,7 @@
     <ClCompile Include="..\..\libcob\mlio.c" />
     <ClCompile Include="..\..\libcob\move.c" />
     <ClCompile Include="..\..\libcob\numeric.c" />
+    <ClCompile Include="..\..\libcob\profiling.c" />
     <ClCompile Include="..\..\libcob\reportio.c" />
     <ClCompile Include="..\..\libcob\screenio.c" />
     <ClCompile Include="..\..\libcob\strings.c" />

diff --git a/build_windows/vs2013/libcob.vcxproj.filters b/build_windows/vs2013/libcob.vcxproj.filters
@@ -81,6 +81,9 @@
     <ClCompile Include="..\..\libcob\cobcapi.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\libcob\profiling.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\config.h">
@@ -129,4 +132,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/build_windows/vs2015/libcob.vcxproj b/build_windows/vs2015/libcob.vcxproj
@@ -181,6 +181,7 @@
     <ClCompile Include="..\..\libcob\mlio.c" />
     <ClCompile Include="..\..\libcob\move.c" />
     <ClCompile Include="..\..\libcob\numeric.c" />
+    <ClCompile Include="..\..\libcob\profiling.c" />
     <ClCompile Include="..\..\libcob\reportio.c" />
     <ClCompile Include="..\..\libcob\screenio.c" />
     <ClCompile Include="..\..\libcob\strings.c" />

diff --git a/build_windows/vs2015/libcob.vcxproj.filters b/build_windows/vs2015/libcob.vcxproj.filters
@@ -81,6 +81,9 @@
     <ClCompile Include="..\..\libcob\cobcapi.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\libcob\profiling.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\config.h">
@@ -129,4 +132,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/build_windows/vs2017/libcob.vcxproj b/build_windows/vs2017/libcob.vcxproj
@@ -186,6 +186,7 @@
     <ClCompile Include="..\..\libcob\mlio.c" />
     <ClCompile Include="..\..\libcob\move.c" />
     <ClCompile Include="..\..\libcob\numeric.c" />
+    <ClCompile Include="..\..\libcob\profiling.c" />
     <ClCompile Include="..\..\libcob\reportio.c" />
     <ClCompile Include="..\..\libcob\screenio.c" />
     <ClCompile Include="..\..\libcob\strings.c" />

diff --git a/build_windows/vs2017/libcob.vcxproj.filters b/build_windows/vs2017/libcob.vcxproj.filters
@@ -81,6 +81,9 @@
     <ClCompile Include="..\..\libcob\cobcapi.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\libcob\profiling.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\config.h">
@@ -129,4 +132,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/build_windows/vs2019/libcob.vcxproj b/build_windows/vs2019/libcob.vcxproj
@@ -186,6 +186,7 @@
     <ClCompile Include="..\..\libcob\mlio.c" />
     <ClCompile Include="..\..\libcob\move.c" />
     <ClCompile Include="..\..\libcob\numeric.c" />
+    <ClCompile Include="..\..\libcob\profiling.c" />
     <ClCompile Include="..\..\libcob\reportio.c" />
     <ClCompile Include="..\..\libcob\screenio.c" />
     <ClCompile Include="..\..\libcob\strings.c" />

diff --git a/build_windows/vs2019/libcob.vcxproj.filters b/build_windows/vs2019/libcob.vcxproj.filters
@@ -81,6 +81,9 @@
     <ClCompile Include="..\..\libcob\cobcapi.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\libcob\profiling.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\config.h">
@@ -129,4 +132,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/cobc/ChangeLog b/cobc/ChangeLog
@@ -1,4 +1,8 @@
 
+2024-05-14  David Declerck <[email protected]>
+
+	* flag.def: fix macro usage for MSVC
+
 2024-05-03  Simon Sobisch <[email protected]>
 
 	* cobc.c (main): refactored to not need iterating via "iparams"

diff --git a/cobc/flag.def b/cobc/flag.def
@@ -120,11 +120,16 @@ CB_FLAG (cb_flag_winmain, COB_SHOW, "winmain",
 #undef COB_SHOW
 
 #ifdef HAVE_ATTRIBUTE_CONSTRUCTOR
-CB_FLAG_ON (cb_flag_use_constructor, 1, "use-constructor",
+#define CB_FLAG_M CB_FLAG_ON
+#define COB_SHOW 1
 #else
-CB_FLAG (cb_flag_use_constructor, 0, "use-constructor",
+#define CB_FLAG_M CB_FLAG
+#define COB_SHOW 0
 #endif
+CB_FLAG_M (cb_flag_use_constructor, COB_SHOW, "use-constructor",
 	_("  -fuse-constructor     generate internal one-time code via constructor"))
+#undef CB_FLAG_M
+#undef COB_SHOW
 
 CB_FLAG (cb_flag_computed_goto, 0, "computed-goto",
 	_("  -fcomputed-goto       generate computed goto C statements"))
-Original file line number
+Diff line change
@@ Expand Up / @@ -261,6 +261,10 @@ @@
     				RelativePath="..\..\libcob\numeric.c"
     				>
     			</File>
+    			<File
+    				RelativePath="..\..\libcob\profiling.c"
+    				>
+    			</File>
     			<File
     				RelativePath="..\..\libcob\reportio.c"
     				>
@@ Expand Down @@