Mercurial > hg > orthanc-databases

comparison Resources/MariaDB/mariadb-connector-c-3.1.11.patch @ 184:e8c3c92f2532

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgade to mariadb-connector-c 3.1.11
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 16 Dec 2020 09:47:14 +0100
parents
children 7c46155b5bb4
comparison
equal deleted inserted replaced
183:2f94b2046d7c 184:e8c3c92f2532
1 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
2 --- mariadb-connector-c-3.1.11-src.orig/include/ma_global.h 2020-12-15 12:42:41.791904385 +0100
3 +++ mariadb-connector-c-3.1.11-src/include/ma_global.h 2020-12-16 09:28:04.237789973 +0100
4 @@ -606,7 +606,9 @@
5 #error "Neither int or long is of 4 bytes width"
6 #endif
7
8 -#if !defined(HAVE_ULONG) && !defined(HAVE_LINUXTHREADS) && !defined(__USE_MISC)
9 +#if defined(__LSB_VERSION__)
10 +typedef unsigned long ulong; /* Short for unsigned long */
11 +#elif !defined(HAVE_ULONG) && !defined(HAVE_LINUXTHREADS) && !defined(__USE_MISC)
12 typedef unsigned long ulong; /* Short for unsigned long */
13 #endif
14 #ifndef longlong_defined
15 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
16 --- mariadb-connector-c-3.1.11-src.orig/plugins/pvio/pvio_socket.c 2020-12-15 12:42:41.795904383 +0100
17 +++ mariadb-connector-c-3.1.11-src/plugins/pvio/pvio_socket.c 2020-12-16 09:29:31.061052964 +0100
18 @@ -60,6 +60,11 @@
19 #define IS_SOCKET_EINTR(err) 0
20 #endif
21
22 +#if defined(__LSB_VERSION__)
23 +// WARNING: This definition might break true Linux Standard Base compatibility!
24 +# define MSG_DONTWAIT 0x40 /* Nonblocking IO. */
25 +#endif
26 +
27 #ifndef SOCKET_ERROR
28 #define SOCKET_ERROR -1
29 #endif