diff options
author | Tony Theodore <tonyt@logyst.com> | 2013-08-16 09:44:30 (GMT) |
---|---|---|
committer | Tony Theodore <tonyt@logyst.com> | 2013-08-16 09:44:30 (GMT) |
commit | 7bfa7964a15df995cf13c9b2cf20e6246daf8c67 (patch) | |
tree | 42dd57ab222a06e8a71c753c7a6c7b928d964646 /src | |
parent | 71abd6e106a2a3c95202e6e18fc3f47ffeedd7ae (diff) | |
download | mxe-7bfa7964a15df995cf13c9b2cf20e6246daf8c67.zip mxe-7bfa7964a15df995cf13c9b2cf20e6246daf8c67.tar.gz mxe-7bfa7964a15df995cf13c9b2cf20e6246daf8c67.tar.bz2 |
Revert "package pthreads-w32: remove patch - DPTW32_STATIC_LIB is define with GC-static target"
This reverts commit 71abd6e106a2a3c95202e6e18fc3f47ffeedd7ae.
Diffstat (limited to 'src')
-rw-r--r-- | src/pthreads-w32-1-fixes.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/src/pthreads-w32-1-fixes.patch b/src/pthreads-w32-1-fixes.patch new file mode 100644 index 0000000..ef99e5b --- /dev/null +++ b/src/pthreads-w32-1-fixes.patch @@ -0,0 +1,62 @@ +This file is part of MXE. +See index.html for further information. + +From e951f784c852f4cd8298864190936fded1efceba Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Sun, 27 May 2012 22:00:19 +0200 +Subject: [PATCH] force static for convenience + +--- + pthread.h | 4 ++++ + sched.h | 4 ++++ + semaphore.h | 4 ++++ + 3 files changed, 12 insertions(+) + +diff --git a/pthread.h b/pthread.h +index b4072f7..c88c886 100755 +--- a/pthread.h ++++ b/pthread.h +@@ -547,6 +547,10 @@ extern "C" + * do NOT define PTW32_BUILD, and then the variables/functions will + * be imported correctly. + */ ++ ++// MXE: Set this for convenience here since MXE only does static. ++#define PTW32_STATIC_LIB ++ + #if !defined(PTW32_STATIC_LIB) + # if defined(PTW32_BUILD) + # define PTW32_DLLPORT __declspec (dllexport) +diff --git a/sched.h b/sched.h +index f36a97a..1f4f401 100755 +--- a/sched.h ++++ b/sched.h +@@ -76,6 +76,10 @@ + * do NOT define PTW32_BUILD, and then the variables/functions will + * be imported correctly. + */ ++ ++// MXE: Set this for convenience here since MXE only does static. ++#define PTW32_STATIC_LIB ++ + #if !defined(PTW32_STATIC_LIB) + # if defined(PTW32_BUILD) + # define PTW32_DLLPORT __declspec (dllexport) +diff --git a/semaphore.h b/semaphore.h +index c6e9407..2b64173 100755 +--- a/semaphore.h ++++ b/semaphore.h +@@ -75,6 +75,10 @@ + * do NOT define PTW32_BUILD, and then the variables/functions will + * be imported correctly. + */ ++ ++// MXE: Set this for convenience here since MXE only does static. ++#define PTW32_STATIC_LIB ++ + #if !defined(PTW32_STATIC_LIB) + # if defined(PTW32_BUILD) + # define PTW32_DLLPORT __declspec (dllexport) +-- +1.7.9.2 + |