Mercurial > hg > orthanc-databases

changeset 185:7c46155b5bb4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix mingw build
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 16 Dec 2020 13:59:17 +0100
parents e8c3c92f2532
children 6fe74f9a516e
files Resources/CMake/MariaDBConfiguration.cmake Resources/MariaDB/mariadb-connector-c-3.1.11.patch
diffstat 2 files changed, 32 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/CMake/MariaDBConfiguration.cmake	Wed Dec 16 09:47:14 2020 +0100
+++ b/Resources/CMake/MariaDBConfiguration.cmake	Wed Dec 16 13:59:17 2020 +0100
@@ -58,7 +58,9 @@
                               ${MARIADB_CLIENT_VERSION_MINOR} * 100   +
                               ${MARIADB_CLIENT_VERSION_PATCH}")
                             
-  #set(HAVE_DLOPEN 1)  # Not needed anymore in 3.1.11
+  add_definitions(-DHAVE_DLOPEN=1)                          
+  #set(HAVE_DLOPEN 1)  # Replaced by the C macro above in 3.1.11
+  
   set(PROTOCOL_VERSION ${MARIADB_CLIENT_VERSION_MAJOR})
   set(MARIADB_PORT 3306)
   set(MARIADB_UNIX_ADDR "/var/run/mysqld/mysqld.sock")
--- a/Resources/MariaDB/mariadb-connector-c-3.1.11.patch	Wed Dec 16 09:47:14 2020 +0100
+++ b/Resources/MariaDB/mariadb-connector-c-3.1.11.patch	Wed Dec 16 13:59:17 2020 +0100
@@ -1,6 +1,6 @@
 diff -urEb mariadb-connector-c-3.1.11-src.orig/include/ma_global.h mariadb-connector-c-3.1.11-src/include/ma_global.h
---- mariadb-connector-c-3.1.11-src.orig/include/ma_global.h	2020-12-15 12:42:41.791904385 +0100
-+++ mariadb-connector-c-3.1.11-src/include/ma_global.h	2020-12-16 09:28:04.237789973 +0100
+--- mariadb-connector-c-3.1.11-src.orig/include/ma_global.h	2020-12-16 13:47:31.950009259 +0100
++++ mariadb-connector-c-3.1.11-src/include/ma_global.h	2020-12-16 13:50:23.705910282 +0100
 @@ -606,7 +606,9 @@
  #error "Neither int or long is of 4 bytes width"
  #endif
@@ -12,9 +12,34 @@
  typedef unsigned long	ulong;	/* Short for unsigned long */
  #endif
  #ifndef longlong_defined
+diff -urEb mariadb-connector-c-3.1.11-src.orig/include/mysql/client_plugin.h mariadb-connector-c-3.1.11-src/include/mysql/client_plugin.h
+--- mariadb-connector-c-3.1.11-src.orig/include/mysql/client_plugin.h	2020-12-16 13:47:31.950009259 +0100
++++ mariadb-connector-c-3.1.11-src/include/mysql/client_plugin.h	2020-12-16 13:50:37.913900837 +0100
+@@ -180,7 +180,7 @@
+   @retval
+   a pointer to the loaded plugin, or NULL in case of a failure
+ */
+-struct st_mysql_client_plugin *
++struct st_mysql_client_plugin * STDCALL
+ mysql_load_plugin(struct st_mysql *mysql, const char *name, int type,
+                   int argc, ...);
+ 
+diff -urEb mariadb-connector-c-3.1.11-src.orig/include/mysql.h mariadb-connector-c-3.1.11-src/include/mysql.h
+--- mariadb-connector-c-3.1.11-src.orig/include/mysql.h	2020-12-16 13:47:31.950009259 +0100
++++ mariadb-connector-c-3.1.11-src/include/mysql.h	2020-12-16 13:54:01.145749406 +0100
+@@ -467,7 +467,7 @@
+   MYSQL_CLIENT_PLUGIN_HEADER
+ };
+ 
+-struct st_mysql_client_plugin *
++struct st_mysql_client_plugin * STDCALL
+ mysql_load_plugin(struct st_mysql *mysql, const char *name, int type,
+                   int argc, ...);
+ struct st_mysql_client_plugin * STDCALL
+Only in mariadb-connector-c-3.1.11-src/include: mysql.h~
 diff -urEb mariadb-connector-c-3.1.11-src.orig/plugins/pvio/pvio_socket.c mariadb-connector-c-3.1.11-src/plugins/pvio/pvio_socket.c
---- mariadb-connector-c-3.1.11-src.orig/plugins/pvio/pvio_socket.c	2020-12-15 12:42:41.795904383 +0100
-+++ mariadb-connector-c-3.1.11-src/plugins/pvio/pvio_socket.c	2020-12-16 09:29:31.061052964 +0100
+--- mariadb-connector-c-3.1.11-src.orig/plugins/pvio/pvio_socket.c	2020-12-16 13:47:31.954009258 +0100
++++ mariadb-connector-c-3.1.11-src/plugins/pvio/pvio_socket.c	2020-12-16 13:50:23.705910282 +0100
 @@ -60,6 +60,11 @@
  #define IS_SOCKET_EINTR(err) 0
  #endif