From 35e76431e5bdf24b67dc0b9a3f78367adb36b15c Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Wed, 13 Nov 2024 11:39:14 -0500
Subject: Fix build as C with MSVC

It used to be necessary to build modern C code as C++ with MSVC, but its C
support has become more or less serviceable, so remove the flag to force C++
mode and build as C everywhere.
---
 NEWS                           | 3 ++-
 meson.build                    | 5 -----
 meson/suppressions/meson.build | 4 ----
 src/sord.c                     | 2 +-
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/NEWS b/NEWS
index 2e2078c..a02e9fb 100644
--- a/NEWS
+++ b/NEWS
@@ -2,9 +2,10 @@ sord (0.16.17) unstable; urgency=medium
 
   * Add option to install tool man pages
   * Enable clang nullability checks
+  * Fix build as C with MSVC
   * Fix library current_version on MacOS
 
- -- David Robillard <d@drobilla.net>  Thu, 14 Mar 2024 18:12:02 +0000
+ -- David Robillard <d@drobilla.net>  Wed, 13 Nov 2024 16:38:32 +0000
 
 sord (0.16.16) stable; urgency=medium
 
diff --git a/meson.build b/meson.build
index e4579d2..b1c9023 100644
--- a/meson.build
+++ b/meson.build
@@ -30,11 +30,6 @@ cc = meson.get_compiler('c')
 # Set global warning flags
 subdir('meson/suppressions')
 
-# Build as C++ with MSVC
-if cc.get_id() == 'msvc'
-  add_project_arguments(['/TP'], language: ['c'])
-endif
-
 ################
 # Dependencies #
 ################
diff --git a/meson/suppressions/meson.build b/meson/suppressions/meson.build
index cacc4f7..dda5b84 100644
--- a/meson/suppressions/meson.build
+++ b/meson/suppressions/meson.build
@@ -96,15 +96,11 @@ elif cc.get_id() == 'msvc'
   if warning_level == 'everything'
     c_suppressions += [
       '/wd4061', # enumerator in switch is not explicitly handled
-      '/wd4200', # zero-sized array in struct/union
       '/wd4514', # unreferenced inline function has been removed
       '/wd4710', # function not inlined
       '/wd4711', # function selected for automatic inline expansion
-      '/wd4800', # implicit conversion from int to bool
       '/wd4820', # padding added after construct
-      '/wd4996', # POSIX name for this item is deprecated
       '/wd5045', # will insert Spectre mitigation for memory load
-      '/wd5264', # const variable is not used
     ]
   endif
 
diff --git a/src/sord.c b/src/sord.c
index 4e5934e..52a9ad0 100644
--- a/src/sord.c
+++ b/src/sord.c
@@ -935,7 +935,7 @@ sord_get(SordModel*      model,
          const SordNode* o,
          const SordNode* g)
 {
-  if ((bool)s + (bool)p + (bool)o != 2) {
+  if (!!s + !!p + !!o != 2) {
     return NULL;
   }
 
-- 
cgit v1.2.1