From 68cf5f591d99aa9a826347687f844e9eb5d0cfd8 Mon Sep 17 00:00:00 2001
From: Daniel Markstedt <daniel@mindani.net>
Date: Sun, 29 Mar 2026 09:37:38 +0200
Subject: [PATCH] rename namespace pollution meson option and define in
 config.h

the new option name emphasizes the enabling of backwards compatibility API macros, which is a more constructive and actionable than 'namespace pollution'

meson previously defined BSTRLIB_REDUCE_NAMESPACE_POLLUTION as a compiler option, but now we use config.h instead for transparency
---
 meson.build       |  8 ++++----
 meson_options.txt | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/meson.build b/meson.build
index 62740e0..e4cf60a 100644
--- a/meson.build
+++ b/meson.build
@@ -34,10 +34,6 @@ if cc.get_id() == 'msvc'
     endforeach
 endif
 
-if get_option('reduce-namespace-pollution')
-    add_project_arguments('-DBSTRLIB_REDUCE_NAMESPACE_POLLUTION', language: 'c')
-endif
-
 if get_option('enable-fuzzing')
     if cc.get_id() != 'clang'
         error('Fuzz targets require clang (set CC=clang)')
@@ -52,6 +48,10 @@ add_project_arguments(warning_flags, language: 'c')
 bstring_inc = include_directories(['.', 'bstring'])
 conf_data = configuration_data()
 
+if not get_option('enable-old-api')
+    conf_data.set('BSTRLIB_REDUCE_NAMESPACE_POLLUTION', 1)
+endif
+
 if get_option('enable-bgets-workaround')
     conf_data.set('HAVE_BGETS', '1')
 else
diff --git a/meson_options.txt b/meson_options.txt
index ee6221c..15f1a41 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -17,10 +17,10 @@ option(
     description: 'Build libFuzzer fuzz targets (requires clang)',
 )
 option(
-    'fuzz-link-arg',
-    type: 'string',
-    value: '-fsanitize=fuzzer,address',
-    description: 'Linker flag used for fuzz targets (ClusterFuzzLite passes LIB_FUZZING_ENGINE here)',
+    'enable-old-api',
+    type: 'boolean',
+    value: false,
+    description: 'Enable backward compatibility macros for pre-1.0 API',
 )
 option(
     'enable-tests',
@@ -35,8 +35,8 @@ option(
     description: 'Build bstring library with UTF-8 support',
 )
 option(
-    'reduce-namespace-pollution',
-    type: 'boolean',
-    value: true,
-    description: 'Hide backward-compatibility macros in bstraux.h',
+    'fuzz-link-arg',
+    type: 'string',
+    value: '-fsanitize=fuzzer,address',
+    description: 'Linker flag used for fuzz targets (ClusterFuzzLite passes LIB_FUZZING_ENGINE here)',
 )