From 457310de6b90c1988ad9d4202b01c15803e0ced6 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 30 Nov 2024 04:06:57 +0100
Subject: [PATCH] qgis.cpp: namespace str() and xstr() macros

---
 src/core/qgis.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/qgis.cpp b/src/core/qgis.cpp
index daaecd60047..83911cfb21e 100644
--- a/src/core/qgis.cpp
+++ b/src/core/qgis.cpp
@@ -35,8 +35,8 @@
 #include <geos_c.h>
 #include <ogr_api.h>
 
-#define xstr(x) str(x)
-#define str(x) #x
+#define qgis_xstr(x) qgis_str(x)
+#define qgis_str(x) #x
 
 // Version constants
 //
@@ -305,7 +305,7 @@ int Qgis::geosVersionMinor()
 
 int Qgis::geosVersionPatch()
 {
-  static const int version = atoi( xstr( GEOS_VERSION_PATCH ) );
+  static const int version = atoi( qgis_xstr( GEOS_VERSION_PATCH ) );
   return version;
 }