diff options
| author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-11-27 12:16:41 +0000 |
|---|---|---|
| committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-11-27 12:16:41 +0000 |
| commit | 9bc3a70ef29cdf400a14835857737bd98240312a (patch) | |
| tree | c8a02e1169727a773d38ff01473c411572f2382d /ACE/ace/config-win32-mingw64.h | |
| parent | d876bd774c7bc0ec74d5433591aef29cc5c3a771 (diff) | |
| download | ATCD-9bc3a70ef29cdf400a14835857737bd98240312a.tar.gz | |
ChangeLogTag: Wed Nov 27 12:14:43 UTC 2013 Martin Corino <mcorino@remedy.nl>
Diffstat (limited to 'ACE/ace/config-win32-mingw64.h')
| -rw-r--r-- | ACE/ace/config-win32-mingw64.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ACE/ace/config-win32-mingw64.h b/ACE/ace/config-win32-mingw64.h index 7c0971be1fe..cfe6eaa44da 100644 --- a/ACE/ace/config-win32-mingw64.h +++ b/ACE/ace/config-win32-mingw64.h @@ -49,6 +49,15 @@ #endif #if (__MINGW64_VERSION_MAJOR >= 3) # define ACE_FILENO_EQUIVALENT ::_fileno + +// Latest version of MingW64 (GCC 4.8.2) with Win32 threading +// defines a 'pthread_sigmask' macro when including signal.h. +// We have to remove that one since ACE declares a (non-functional) +// pthread_sigmask method in ACE_OS. +# include <signal.h> +# if defined (pthread_sigmask) +# undef pthread_sigmask +# endif #endif #if (__MINGW64_VERSION_MAJOR >= 2) |