Bruno Friedmann
a39062f911
- add gdal-2.2.2-mariadb_102_build_fix.patch to fix build with MariaDB 10.2 (in our case the build with libmariadb library from the mariadb-connector-c package) * upstream commit d63c1a90f81fc3c1f58a8742fb68baf81340ea03) OBS-URL: https://build.opensuse.org/request/show/539986 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gdal?expand=0&rev=50
59 lines
1.9 KiB
Diff
59 lines
1.9 KiB
Diff
From d63c1a90f81fc3c1f58a8742fb68baf81340ea03 Mon Sep 17 00:00:00 2001
|
|
From: Even Rouault <even.rouault@mines-paris.org>
|
|
Date: Sun, 8 Oct 2017 16:40:23 +0000
|
|
Subject: [PATCH] MySQL: fix build with MariaDB 10.2 (fixes #7079)
|
|
|
|
git-svn-id: https://svn.osgeo.org/gdal/trunk@40361 f0d54148-0727-0410-94bb-9a71ac55c965
|
|
---
|
|
gdal/ogr/ogrsf_frmts/mysql/ogr_mysql.h | 1 -
|
|
gdal/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp | 25 -----------------------
|
|
2 files changed, 26 deletions(-)
|
|
|
|
Index: b/ogr/ogrsf_frmts/mysql/ogr_mysql.h
|
|
===================================================================
|
|
--- a/ogr/ogrsf_frmts/mysql/ogr_mysql.h
|
|
+++ b/ogr/ogrsf_frmts/mysql/ogr_mysql.h
|
|
@@ -43,7 +43,6 @@
|
|
#pragma warning( disable : 4211 ) /* nonstandard extension used : redefined extern to static */
|
|
#endif
|
|
|
|
-#include <my_global.h>
|
|
#include <mysql.h>
|
|
|
|
#ifdef _MSC_VER
|
|
Index: b/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp
|
|
===================================================================
|
|
--- a/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp
|
|
+++ b/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp
|
|
@@ -31,30 +31,6 @@
|
|
#include <string>
|
|
#include "ogr_mysql.h"
|
|
|
|
-#ifdef _MSC_VER
|
|
-#pragma warning( push )
|
|
-#pragma warning( disable : 4201 ) /* nonstandard extension used : nameless struct/union */
|
|
-#endif
|
|
-#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))
|
|
-#pragma GCC diagnostic push
|
|
-#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
|
|
-#endif
|
|
-#ifdef __clang__
|
|
-#pragma clang diagnostic push
|
|
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
|
|
-#pragma clang diagnostic ignored "-Wdocumentation"
|
|
-#endif
|
|
-#include <my_sys.h>
|
|
-#ifdef __clang__
|
|
-#pragma clang diagnostic pop
|
|
-#endif
|
|
-#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))
|
|
-#pragma GCC diagnostic pop
|
|
-#endif
|
|
-#ifdef _MSC_VER
|
|
-#pragma warning( pop )
|
|
-#endif
|
|
-
|
|
#include "cpl_conv.h"
|
|
#include "cpl_string.h"
|
|
|