Mercurial > hg > orthanc-databases
annotate Resources/MariaDB/mariadb-connector-c-3.1.11.patch @ 184:e8c3c92f2532
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 |
rev | line source |
---|---|
184
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
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 |
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2 --- mariadb-connector-c-3.1.11-src.orig/include/ma_global.h 2020-12-15 12:42:41.791904385 +0100 |
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3 +++ mariadb-connector-c-3.1.11-src/include/ma_global.h 2020-12-16 09:28:04.237789973 +0100 |
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4 @@ -606,7 +606,9 @@ |
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
5 #error "Neither int or long is of 4 bytes width" |
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
6 #endif |
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
7 |
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
8 -#if !defined(HAVE_ULONG) && !defined(HAVE_LINUXTHREADS) && !defined(__USE_MISC) |
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
9 +#if defined(__LSB_VERSION__) |
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
10 +typedef unsigned long ulong; /* Short for unsigned long */ |
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
11 +#elif !defined(HAVE_ULONG) && !defined(HAVE_LINUXTHREADS) && !defined(__USE_MISC) |
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
12 typedef unsigned long ulong; /* Short for unsigned long */ |
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
13 #endif |
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
14 #ifndef longlong_defined |
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
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 |
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
16 --- mariadb-connector-c-3.1.11-src.orig/plugins/pvio/pvio_socket.c 2020-12-15 12:42:41.795904383 +0100 |
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
17 +++ mariadb-connector-c-3.1.11-src/plugins/pvio/pvio_socket.c 2020-12-16 09:29:31.061052964 +0100 |
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
18 @@ -60,6 +60,11 @@ |
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
19 #define IS_SOCKET_EINTR(err) 0 |
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
20 #endif |
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
21 |
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
22 +#if defined(__LSB_VERSION__) |
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
23 +// WARNING: This definition might break true Linux Standard Base compatibility! |
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
24 +# define MSG_DONTWAIT 0x40 /* Nonblocking IO. */ |
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
25 +#endif |
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
26 + |
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
27 #ifndef SOCKET_ERROR |
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
28 #define SOCKET_ERROR -1 |
e8c3c92f2532
upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
29 #endif |