diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-09-14 13:30:05 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-09-15 10:59:56 +0200 |
| commit | 871d75e9c2c82d4b3ffbbff80f1dfa7a823e4f3d (patch) | |
| tree | ba997ca727e6eccaea4b1877f2b4b1f682facaba /external/mariadb-connector-c/mariadb-swap.patch | |
| parent | 0bb764854361249c60ea31c5366a91dcd938c747 (diff) | |
consistent naming of externals: libmariadb -> mariadb-connector-c
The used version is actually named mariadb_client but since 2.1.0
upstream calls it MariaDB Connector/C.
Change-Id: I51b12a9be55151919585dec91a5fc802ff4fc86b
Reviewed-on: https://gerrit.libreoffice.org/42295
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external/mariadb-connector-c/mariadb-swap.patch')
| -rw-r--r-- | external/mariadb-connector-c/mariadb-swap.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/external/mariadb-connector-c/mariadb-swap.patch b/external/mariadb-connector-c/mariadb-swap.patch new file mode 100644 index 000000000000..bfada2d2c4a6 --- /dev/null +++ b/external/mariadb-connector-c/mariadb-swap.patch @@ -0,0 +1,24 @@ +--- mariadb/include/global.h 2013-03-06 17:06:42.545906061 +0100 ++++ mariadb/include/global.h 2013-03-07 14:45:03.811128674 +0100 +@@ -247,7 +247,9 @@ + #endif + + #define sgn(a) (((a) < 0) ? -1 : ((a) > 0) ? 1 : 0) ++#ifndef __cplusplus + #define swap(t,a,b) { register t dummy; dummy = a; a = b; b = dummy; } ++#endif + #define test(a) ((a) ? 1 : 0) + #define set_if_bigger(a,b) { if ((a) < (b)) (a)=(b); } + #define set_if_smaller(a,b) { if ((a) > (b)) (a)=(b); } +--- mariadb/include/my_global.h 2013-03-06 17:06:42.546906037 +0100 ++++ mariadb/include/my_global.h 2013-03-07 14:44:47.032529753 +0100 +@@ -278,7 +278,9 @@ + #endif + + #define sgn(a) (((a) < 0) ? -1 : ((a) > 0) ? 1 : 0) ++#ifndef __cplusplus + #define swap(t,a,b) { register t dummy; dummy = a; a = b; b = dummy; } ++#endif + #define test(a) ((a) ? 1 : 0) + #define set_if_bigger(a,b) { if ((a) < (b)) (a)=(b); } + #define set_if_smaller(a,b) { if ((a) > (b)) (a)=(b); } |