diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-19 16:50:41 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-19 16:50:41 +0200 |
| commit | 4da0c0619cbf052eb87a618aba4c8de79f0d4325 (patch) | |
| tree | e075b2a2601d6d2f26a8a70fb83cb682cdfb23df /ftnoir_protocol_wine/wine-shm.h | |
| parent | f9b5b72cbcf9f121e0184f9a907bbffd7e1e16a9 (diff) | |
| parent | a8165591d993a23ae71ea4e5bb7df7596688ef7b (diff) | |
Merge branch 'unstable' into trackhat-ui
Diffstat (limited to 'ftnoir_protocol_wine/wine-shm.h')
| -rw-r--r-- | ftnoir_protocol_wine/wine-shm.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ftnoir_protocol_wine/wine-shm.h b/ftnoir_protocol_wine/wine-shm.h index c0f29cd3..c7e29abb 100644 --- a/ftnoir_protocol_wine/wine-shm.h +++ b/ftnoir_protocol_wine/wine-shm.h @@ -3,6 +3,11 @@ #define WINE_SHM_NAME "facetracknoir-wine-shm" #define WINE_MTX_NAME "facetracknoir-wine-mtx" +// OSX sdk 10.8 build error otherwise +#ifdef _LIBCPP_MSVCRT +# undef _LIBCPP_MSVCRT +#endif + #include <memory> template<typename t> using ptr = std::shared_ptr<t>; |