diff options
| author | Tony Theodore <tonyt@logyst.com> | 2017-02-08 01:38:20 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2017-02-08 01:38:20 (GMT) |
| commit | bf6a78224b8d6a4958e2221d3ccc97056d87feeb (patch) | |
| tree | 5edeb68945c8fe330a2835579712d69774c2de84 | |
| parent | 1020d040db43dc10ee1f37a8377030c4a124beaf (diff) | |
| download | mxe-bf6a78224b8d6a4958e2221d3ccc97056d87feeb.zip mxe-bf6a78224b8d6a4958e2221d3ccc97056d87feeb.tar.gz mxe-bf6a78224b8d6a4958e2221d3ccc97056d87feeb.tar.bz2 | |
libmysqlclient: fix redefinition of pthreads functions
| -rw-r--r-- | src/libmysqlclient-1-fixes.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/libmysqlclient-1-fixes.patch b/src/libmysqlclient-1-fixes.patch index 6b83ceb..121de67 100644 --- a/src/libmysqlclient-1-fixes.patch +++ b/src/libmysqlclient-1-fixes.patch @@ -450,3 +450,23 @@ index 1111111..2222222 100644 #include "mysys_priv.h" #include <process.h> #include <signal.h> + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore <tonyt@logyst.com> +Date: Wed, 8 Feb 2017 11:51:42 +1100 +Subject: [PATCH] only define localtime_r and gmtime_r when pthreads isn't used + + +diff --git a/include/my_global.h b/include/my_global.h +index 1111111..2222222 100644 +--- a/include/my_global.h ++++ b/include/my_global.h +@@ -629,7 +629,7 @@ enum loglevel { + }; + + +-#ifdef _WIN32 ++#if defined(_WIN32) && !defined(_POSIX_THREAD_SAFE_FUNCTIONS) + /**************************************************************************** + ** Replacements for localtime_r and gmtime_r + ****************************************************************************/ |