projects / packages / crossmingw32-gcc.git / blame
| Commit | Line | Data |
|---|---|---|
| 14b9b67e JB |
1 | --- gcc-5.4.0/libgfortran/intrinsics/chmod.c.orig 2016-12-18 10:38:13.034904609 +0100 |
| 2 | +++ gcc-5.4.0/libgfortran/intrinsics/chmod.c 2016-12-18 10:38:15.398237920 +0100 | |
| 3 | @@ -30,6 +30,9 @@ | |
| 4 | #include <string.h> /* For memcpy. */ | |
| 5 | #include <stdlib.h> /* For free. */ | |
| 6 | #include <sys/stat.h> /* For stat, chmod and umask. */ | |
| 7 | +#ifdef __MINGW32__ | |
| 8 | +#include <io.h> | |
| 9 | +#endif | |
| 10 | ||
| 11 | ||
| 12 | /* INTEGER FUNCTION CHMOD (NAME, MODE) | |
| 0c9e92e0 JB |
13 | --- gcc-7.5.0/libstdc++-v3/libsupc++/new_opa.cc.orig 2019-10-24 17:31:00.754226000 +0200 |
| 14 | +++ gcc-7.5.0/libstdc++-v3/libsupc++/new_opa.cc 2019-12-26 09:33:51.155818937 +0100 | |
| 15 | @@ -29,10 +29,13 @@ | |
| 16 | #include <bits/exception_defines.h> | |
| 17 | #include "new" | |
| 18 | ||
| 19 | -#if !_GLIBCXX_HAVE_ALIGNED_ALLOC && !_GLIBCXX_HAVE__ALIGNED_MALLOC \ | |
| 20 | - && !_GLIBCXX_HAVE_POSIX_MEMALIGN && _GLIBCXX_HAVE_MEMALIGN | |
| 21 | +#if !_GLIBCXX_HAVE_ALIGNED_ALLOC && (!_GLIBCXX_HAVE__ALIGNED_MALLOC || defined(__MINGW32__)) \ | |
| 22 | + && !_GLIBCXX_HAVE_POSIX_MEMALIGN && (_GLIBCXX_HAVE_MEMALIGN || defined(__MINGW32__)) | |
| 23 | # if _GLIBCXX_HOSTED && __has_include(<malloc.h>) | |
| 24 | // Some C libraries declare memalign in <malloc.h> | |
| 25 | +# ifdef __MINGW32__ | |
| 26 | +# define __MSVCRT_VERSION__ 0x0700 | |
| 27 | +# endif | |
| 28 | # include <malloc.h> | |
| 29 | # else | |
| 30 | extern "C" void *memalign(std::size_t boundary, std::size_t size); | |
| 31 | --- gcc-7.5.0/libstdc++-v3/libsupc++/del_opa.cc.orig 2017-01-26 15:30:45.014860000 +0100 | |
| 32 | +++ gcc-7.5.0/libstdc++-v3/libsupc++/del_opa.cc 2019-12-26 09:41:01.210155799 +0100 | |
| 33 | @@ -40,6 +40,16 @@ | |
| 34 | ||
| 35 | #include "new" | |
| 36 | ||
| 37 | +#if !_GLIBCXX_HAVE_ALIGNED_ALLOC && (!_GLIBCXX_HAVE__ALIGNED_MALLOC || defined(__MINGW32__)) \ | |
| 38 | + && !_GLIBCXX_HAVE_POSIX_MEMALIGN && (_GLIBCXX_HAVE_MEMALIGN || defined(__MINGW32__)) | |
| 39 | +# if _GLIBCXX_HOSTED && __has_include(<malloc.h>) | |
| 40 | +# ifdef __MINGW32__ | |
| 41 | +# define __MSVCRT_VERSION__ 0x0700 | |
| 42 | +# endif | |
| 43 | +# include <malloc.h> | |
| 44 | +# endif | |
| 45 | +#endif | |
| 46 | + | |
| 47 | // The sized deletes are defined in other files. | |
| 48 | #pragma GCC diagnostic ignored "-Wsized-deallocation" | |
| 49 |