[Libreoffice-commits] core.git: libmariadb/mariadb-swap.patch libmariadb/UnpackedTarball_mariadb.mk mysqlcppconn/config.h

[Fridrich Å trba]

 libmariadb/UnpackedTarball_mariadb.mk |    1 +
 libmariadb/mariadb-swap.patch         |   24 ++++++++++++++++++++++++
 mysqlcppconn/config.h                 |    2 +-
 3 files changed, 26 insertions(+), 1 deletion(-)

New commits:
commit 0a8b02ad8c7ce930973ba0ddc782bf06f7a1e335
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Mar 7 14:49:09 2013 +0100

    trying to make the whole mariadb sundry on windows
    
    Change-Id: I5d775272ba83752fdafe7b7b702a67e8c76e605a

diff --git a/libmariadb/UnpackedTarball_mariadb.mk b/libmariadb/UnpackedTarball_mariadb.mk
index 499ce70..a68562b 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 0000000..bfada2d
--- /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); }
diff --git a/mysqlcppconn/config.h b/mysqlcppconn/config.h
index 7c2d2eb..19cf389 100644
--- a/mysqlcppconn/config.h
+++ b/mysqlcppconn/config.h
@@ -18,7 +18,7 @@
 #include <inttypes.h>
 #endif
 
-#if !defined(HAVE_STDINT_H) && !defined(HAVE_INTTYPES_H) && !defined(_MSC_VER)
+#if !defined(HAVE_STDINT_H) && !defined(HAVE_INTTYPES_H)
 
 // if we do not have the standard C99 integer types, then define them based on the respective SAL types
 #if !defined(_SYS_TYPES_H)