diff options
| author | Lothar May <lothar.imap@googlemail.com> | 2010-11-20 19:33:55 (GMT) |
|---|---|---|
| committer | Lothar May <lothar.imap@googlemail.com> | 2010-11-20 19:33:55 (GMT) |
| commit | 9f1b4f19c538b6d64d5e2e6b96bf20070ccb2ccf (patch) | |
| tree | a21c1ee37dc9d8211f827cead57f6f3280ed9c97 /src/boost-1-fixes.patch | |
| parent | 19aae653a919ae9426a74c9f94bff2904fec6eb9 (diff) | |
| download | mxe-9f1b4f19c538b6d64d5e2e6b96bf20070ccb2ccf.zip mxe-9f1b4f19c538b6d64d5e2e6b96bf20070ccb2ccf.tar.gz mxe-9f1b4f19c538b6d64d5e2e6b96bf20070ccb2ccf.tar.bz2 | |
remove unneeded patch for package boost
Diffstat (limited to 'src/boost-1-fixes.patch')
| -rw-r--r-- | src/boost-1-fixes.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/src/boost-1-fixes.patch b/src/boost-1-fixes.patch deleted file mode 100644 index 2ec4575..0000000 --- a/src/boost-1-fixes.patch +++ /dev/null @@ -1,44 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -These patches have been taken from: -https://svn.boost.org/trac/boost/changeset/66006 -https://svn.boost.org/trac/boost/changeset/66140 - ---- trunk/boost/asio/error.hpp (revision 62499) -+++ trunk/boost/asio/error.hpp (revision 66006) -@@ -20,5 +20,5 @@ - #include <boost/system/error_code.hpp> - #if defined(BOOST_WINDOWS) || defined(__CYGWIN__) --# include <WinError.h> -+# include <winerror.h> - #else - # include <cerrno> ---- trunk/libs/thread/src/win32/tss_pe.cpp (revision 62718) -+++ trunk/libs/thread/src/win32/tss_pe.cpp (revision 66140) -@@ -39,4 +39,10 @@ - } - -+#if (__MINGW32_MAJOR_VERSION >3) || ((__MINGW32_MAJOR_VERSION==3) && (__MINGW32_MINOR_VERSION>=18)) -+extern "C" -+{ -+ PIMAGE_TLS_CALLBACK __crt_xl_tls_callback__ __attribute__ ((section(".CRT$XLB"))) = on_tls_callback; -+} -+#else - extern "C" { - -@@ -51,8 +57,6 @@ - - PIMAGE_TLS_CALLBACK __crt_xl_start__ __attribute__ ((section(".CRT$XLA"))) = 0; -- PIMAGE_TLS_CALLBACK __crt_xl_tls_callback__ __attribute__ ((section(".CRT$XLB"))) = on_tls_callback; - PIMAGE_TLS_CALLBACK __crt_xl_end__ __attribute__ ((section(".CRT$XLZ"))) = 0; - } -- - extern "C" const IMAGE_TLS_DIRECTORY32 _tls_used __attribute__ ((section(".rdata$T"))) = - { -@@ -64,4 +68,5 @@ - (DWORD) 0 - }; -+#endif - - |