connectivity/source/drivers/postgresql/pq_driver.hxx | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 0940261be357bfaa42d06444e91e7b3e6735e8d8
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Dec 9 16:20:59 2019 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Mon Dec 9 17:27:47 2019 +0100
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 <lio...@mamane.lu>
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
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 !
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
