[OMPT-svn-commit] OpenMPT r21564 - in branches/OpenMPT-1.30: . openmpt123

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

Author: manx
Date: Sun Sep  1 10:33:07 2024
New Revision: 21564
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21564

Log:
Merged revision(s) 21562 from trunk/OpenMPT:
[Fix] openmpt123: Work-around cppcheck 2.15.0 getting very confused about Linux glibc headers: "/usr/include/x86_64-linux-gnu/sys/types.h:230: warning: error: There is an unknown macro here somewhere. Configuration is required. If __END_DECLS is a macro then please configure it. [unknownMacro]".
........

Modified:
   branches/OpenMPT-1.30/   (props changed)
   branches/OpenMPT-1.30/openmpt123/openmpt123.cpp

Modified: branches/OpenMPT-1.30/openmpt123/openmpt123.cpp
==============================================================================
--- branches/OpenMPT-1.30/openmpt123/openmpt123.cpp	Sun Sep  1 10:32:29 2024	(r21563)
+++ branches/OpenMPT-1.30/openmpt123/openmpt123.cpp	Sun Sep  1 10:33:07 2024	(r21564)
@@ -62,7 +62,9 @@
 #include <cstring>
 #include <ctime>
 
-#if defined(__DJGPP__)
+#if defined(CPPCHECK)
+// cppcheck 2.15.0 gets confused by linux/glibc headers
+#elif defined(__DJGPP__)
 #include <conio.h>
 #include <dpmi.h>
 #include <fcntl.h>