[OMPT-svn-commit] OpenMPT r21571 - in branches/OpenMPT-1.31: . build/cppcheck openmpt123

[<sv...@op...>]

Author: manx
Date: Tue Sep  3 15:05:59 2024
New Revision: 21571
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21571

Log:
Merged revision(s) 21570 from trunk/OpenMPT:
[Fix] Try a different work-around for cppcheck 2.15.0. See r21562.
........

Added:
   branches/OpenMPT-1.31/build/cppcheck/glibc-workarounds.cfg
      - copied unchanged from r21570, trunk/OpenMPT/build/cppcheck/glibc-workarounds.cfg
Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/Makefile
   branches/OpenMPT-1.31/openmpt123/openmpt123.cpp

Modified: branches/OpenMPT-1.31/Makefile
==============================================================================
--- branches/OpenMPT-1.31/Makefile	Tue Sep  3 08:54:22 2024	(r21570)
+++ branches/OpenMPT-1.31/Makefile	Tue Sep  3 15:05:59 2024	(r21571)
@@ -976,6 +976,7 @@
 
 CPPCHECK_FLAGS += -j $(NUMTHREADS)
 CPPCHECK_FLAGS += --std=c11 --std=c++17
+CPPCHECK_FLAGS += --library=build/cppcheck/glibc-workarounds.cfg
 CPPCHECK_FLAGS += --quiet
 CPPCHECK_FLAGS += --enable=warning --inline-suppr --template='{file}:{line}: warning: {severity}: {message} [{id}]'
 CPPCHECK_FLAGS += --check-level=exhaustive

Copied: branches/OpenMPT-1.31/build/cppcheck/glibc-workarounds.cfg (from r21570, trunk/OpenMPT/build/cppcheck/glibc-workarounds.cfg)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/OpenMPT-1.31/build/cppcheck/glibc-workarounds.cfg	Tue Sep  3 15:05:59 2024	(r21571, copy of r21570, trunk/OpenMPT/build/cppcheck/glibc-workarounds.cfg)
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<def format="2">
+  <define name="__BEGIN_DECLS" value="extern &quot;C&quot; {"/>
+  <define name="__END_DECLS" value="}"/>
+</def>

Modified: branches/OpenMPT-1.31/openmpt123/openmpt123.cpp
==============================================================================
--- branches/OpenMPT-1.31/openmpt123/openmpt123.cpp	Tue Sep  3 08:54:22 2024	(r21570)
+++ branches/OpenMPT-1.31/openmpt123/openmpt123.cpp	Tue Sep  3 15:05:59 2024	(r21571)
@@ -69,9 +69,7 @@
 #include <cstring>
 #include <ctime>
 
-#if defined(CPPCHECK)
-// cppcheck 2.15.0 gets confused by linux/glibc headers
-#elif MPT_OS_DJGPP
+#if MPT_OS_DJGPP
 #include <conio.h>
 #include <crt0.h>
 #include <dpmi.h>