From 0940261be357bfaa42d06444e91e7b3e6735e8d8 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 9 Dec 2019 16:20:59 +0100
Subject: [PATCH] Fix PQ_SDBC_DRIVER_VERSION

...which should expand to "0.8.2" rather than
"PQ_SDBC_MAJOR.PQ_SDBC_MINOR.PQ_SDBC_MICRO"

Change-Id: I4dad1f895d6c1c4daead8d325fa35bfabe651419
Reviewed-on: https://gerrit.libreoffice.org/84766
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 connectivity/source/drivers/postgresql/pq_driver.hxx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/connectivity/source/drivers/postgresql/pq_driver.hxx b/connectivity/source/drivers/postgresql/pq_driver.hxx
index de41bc9ed38e..4cd0ee736a31 100644
--- a/connectivity/source/drivers/postgresql/pq_driver.hxx
+++ b/connectivity/source/drivers/postgresql/pq_driver.hxx
@@ -38,7 +38,7 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_POSTGRESQL_PQ_DRIVER_HXX
 
 #include <osl/mutex.hxx>
-
+#include <sal/macros.h>
 #include <cppuhelper/compbase.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -51,11 +51,9 @@
 namespace pq_sdbc_driver
 {
 
-#define MY_STRINGIFY( x ) #x
-
-#define PQ_SDBC_DRIVER_VERSION MY_STRINGIFY(PQ_SDBC_MAJOR) "."  \
-                               MY_STRINGIFY(PQ_SDBC_MINOR) "." \
-                               MY_STRINGIFY(PQ_SDBC_MICRO)
+#define PQ_SDBC_DRIVER_VERSION SAL_STRINGIFY(PQ_SDBC_MAJOR) "."  \
+                               SAL_STRINGIFY(PQ_SDBC_MINOR) "." \
+                               SAL_STRINGIFY(PQ_SDBC_MICRO)
 
 struct MutexHolder { osl::Mutex m_mutex; };
 // use this to switch off sdbc support !