Mercurial > hg > orthanc-databases

comparison Resources/MariaDB/mariadb-connector-c-3.0.5.patch @ 0:7cea966b6829

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
initial commit
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 04 Jul 2018 08:16:29 +0200
parents
children
comparison
equal deleted inserted replaced
-1:000000000000 0:7cea966b6829
1 diff -urEb mariadb-connector-c-3.0.5-src.orig/include/ma_global.h mariadb-connector-c-3.0.5-src/include/ma_global.h
2 --- mariadb-connector-c-3.0.5-src.orig/include/ma_global.h 2018-05-30 16:31:17.000000000 +0200
3 +++ mariadb-connector-c-3.0.5-src/include/ma_global.h 2018-06-12 17:08:52.578709929 +0200
4 @@ -23,7 +23,7 @@
5
6 #ifdef _WIN32
7 #include <winsock2.h>
8 -#include <Windows.h>
9 +#include <windows.h>
10 #include <stdlib.h>
11 #define strcasecmp _stricmp
12 #define sleep(x) Sleep(1000*(x))
13 @@ -638,7 +638,9 @@
14 #error "Neither int or long is of 4 bytes width"
15 #endif
16
17 -#if !defined(HAVE_ULONG) && !defined(HAVE_LINUXTHREADS) && !defined(__USE_MISC)
18 +#if defined(__LSB_VERSION__)
19 +typedef unsigned long ulong; /* Short for unsigned long */
20 +#elif !defined(HAVE_ULONG) && !defined(HAVE_LINUXTHREADS) && !defined(__USE_MISC)
21 typedef unsigned long ulong; /* Short for unsigned long */
22 #endif
23 #ifndef longlong_defined
24 diff -urEb mariadb-connector-c-3.0.5-src.orig/libmariadb/ma_client_plugin.c.in mariadb-connector-c-3.0.5-src/libmariadb/ma_client_plugin.c.in
25 --- mariadb-connector-c-3.0.5-src.orig/libmariadb/ma_client_plugin.c.in 2018-05-30 16:31:17.000000000 +0200
26 +++ mariadb-connector-c-3.0.5-src/libmariadb/ma_client_plugin.c.in 2018-06-12 16:34:45.402745736 +0200
27 @@ -456,7 +456,7 @@
28
29
30 /* see <mysql/client_plugin.h> for a full description */
31 -struct st_mysql_client_plugin * STDCALL
32 +struct st_mysql_client_plugin *
33 mysql_load_plugin(MYSQL *mysql, const char *name, int type, int argc, ...)
34 {
35 struct st_mysql_client_plugin *p;
36 diff -urEb mariadb-connector-c-3.0.5-src.orig/libmariadb/ma_default.c mariadb-connector-c-3.0.5-src/libmariadb/ma_default.c
37 --- mariadb-connector-c-3.0.5-src.orig/libmariadb/ma_default.c 2018-05-30 16:31:17.000000000 +0200
38 +++ mariadb-connector-c-3.0.5-src/libmariadb/ma_default.c 2018-06-12 16:34:33.246745949 +0200
39 @@ -27,7 +27,7 @@
40
41 #ifdef _WIN32
42 #include <io.h>
43 -#include "Shlwapi.h"
44 +#include "shlwapi.h"
45
46 static const char *ini_exts[]= {"ini", "cnf", 0};
47 #define R_OK 4
48 diff -urEb mariadb-connector-c-3.0.5-src.orig/libmariadb/mariadb_lib.c mariadb-connector-c-3.0.5-src/libmariadb/mariadb_lib.c
49 --- mariadb-connector-c-3.0.5-src.orig/libmariadb/mariadb_lib.c 2018-05-30 16:31:17.000000000 +0200
50 +++ mariadb-connector-c-3.0.5-src/libmariadb/mariadb_lib.c 2018-06-12 16:34:33.246745949 +0200
51 @@ -69,7 +69,7 @@
52 #endif
53 #include <mysql/client_plugin.h>
54 #ifdef _WIN32
55 -#include "Shlwapi.h"
56 +#include "shlwapi.h"
57 #endif
58
59 #define ASYNC_CONTEXT_DEFAULT_STACK_SIZE (4096*15)
60 diff -urEb mariadb-connector-c-3.0.5-src.orig/plugins/pvio/pvio_socket.c mariadb-connector-c-3.0.5-src/plugins/pvio/pvio_socket.c
61 --- mariadb-connector-c-3.0.5-src.orig/plugins/pvio/pvio_socket.c 2018-05-30 16:31:17.000000000 +0200
62 +++ mariadb-connector-c-3.0.5-src/plugins/pvio/pvio_socket.c 2018-06-12 17:21:34.554696601 +0200
63 @@ -60,6 +60,11 @@
64 #define IS_SOCKET_EINTR(err) 0
65 #endif
66
67 +#if defined(__LSB_VERSION__)
68 +// WARNING: This definition might break true Linux Standard Base compatibility!
69 +#define MSG_DONTWAIT 0x40 /* Nonblocking IO. */
70 +#endif
71 +
72 #ifndef SOCKET_ERROR
73 #define SOCKET_ERROR -1
74 #endif