diff options
Diffstat (limited to 'libmariadb')
| -rw-r--r-- | libmariadb/UnpackedTarball_mariadb.mk | 1 | ||||
| -rw-r--r-- | libmariadb/mariadb-swap.patch | 24 |
2 files changed, 25 insertions, 0 deletions
diff --git a/libmariadb/UnpackedTarball_mariadb.mk b/libmariadb/UnpackedTarball_mariadb.mk index 499ce70ba832..a68562ba0bfc 100644 --- a/libmariadb/UnpackedTarball_mariadb.mk +++ b/libmariadb/UnpackedTarball_mariadb.mk @@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mariadb,1)) $(eval $(call gb_UnpackedTarball_add_patches,mariadb,\ libmariadb/mariadb-thread.patch \ + libmariadb/mariadb-swap.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/libmariadb/mariadb-swap.patch b/libmariadb/mariadb-swap.patch new file mode 100644 index 000000000000..bfada2d2c4a6 --- /dev/null +++ b/libmariadb/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); } |