Skip to content

allow non-default exception handling targets #1664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
starius merged 4 commits into from
Feb 11, 2017
Merged

allow non-default exception handling targets #1664

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5da8168
allow non-default exception handling targets
tonytheodore Feb 4, 2017
b8850b2
Makefile: add [POSIX | WIN32]_THREADS variable
tonytheodore Feb 7, 2017
1020d04
apr: fix posix build and use SOURCE_DIR etc.
tonytheodore Feb 7, 2017
bf6a782
libmysqlclient: fix redefinition of pthreads functions
tonytheodore Feb 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
libmysqlclient: fix redefinition of pthreads functions
  • Loading branch information
@tonytheodore
tonytheodore committed Feb 8, 2017
commit bf6a78224b8d6a4958e2221d3ccc97056d87feeb
20 changes: 20 additions & 0 deletions src/libmysqlclient-1-fixes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
****************************************************************************/