libmariadb/UnpackedTarball_mariadb.mk | 1 + libmariadb/mariadb-msvc.patch.1 | 13 +++++++++++++ 2 files changed, 14 insertions(+)
New commits: commit 81bee24d6b6e12219811813aa1c16892c93e0ba7 Author: Michael Stahl <[email protected]> Date: Wed Apr 17 15:48:46 2013 +0200 libmariadb: make it build with MSVC 2008 ... although i'm not sure if the stub implementation of pthread_cond_timedwait makes that much sense. Change-Id: If1926e760c0e1b84fd2ac48431c06c6f1ba4dd1d diff --git a/libmariadb/UnpackedTarball_mariadb.mk b/libmariadb/UnpackedTarball_mariadb.mk index f8694ab..ce0bd9f 100644 --- a/libmariadb/UnpackedTarball_mariadb.mk +++ b/libmariadb/UnpackedTarball_mariadb.mk @@ -31,6 +31,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,mariadb,\ libmariadb/mariadb-swap.patch \ libmariadb/mariadb-trunk-40.patch \ libmariadb/mariadb-static-inline.patch \ + libmariadb/mariadb-msvc.patch.1 \ )) $(eval $(call gb_UnpackedTarball_fix_end_of_line,mariadb,\ diff --git a/libmariadb/mariadb-msvc.patch.1 b/libmariadb/mariadb-msvc.patch.1 new file mode 100644 index 0000000..60fddae --- /dev/null +++ b/libmariadb/mariadb-msvc.patch.1 @@ -0,0 +1,13 @@ +--- mariadb/libmysql/my_pthread.c.orig 2013-04-17 15:45:52.025896770 +0200 ++++ mariadb/libmysql/my_pthread.c 2013-04-17 15:47:32.292895908 +0200 +@@ -28,6 +28,10 @@ + + #ifdef _WIN32 + ++#ifndef ETIMEDOUT /* does not exist MSVC 2008 but was added in MSVC 2010 */ ++#define ETIMEDOUT 145 ++#endif ++ + int + pthread_cond_init (pthread_cond_t *cv, const pthread_condattr_t *attr) + { _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
