diff options
| author | Jonathan Yong <10walls@gmail.com> | 2017-03-02 11:03:23 +0000 |
|---|---|---|
| committer | Jonathan Yong <jyong@gcc.gnu.org> | 2017-03-02 11:03:23 +0000 |
| commit | db9f7f657e035786836f8371b56d876a9bec46bc (patch) | |
| tree | b10581a72650dec37da2326bc4ebf785e2b17d58 /libgcc | |
| parent | 126437c5dad88fb2cc6172f09c556ff09844b649 (diff) | |
| download | gcc-db9f7f657e035786836f8371b56d876a9bec46bc.zip gcc-db9f7f657e035786836f8371b56d876a9bec46bc.tar.gz gcc-db9f7f657e035786836f8371b56d876a9bec46bc.tar.bz2 | |
gthr-win32.h: Define NOGDI before windows.h include to prevent w32api CC_NONE macro clash...
* config/i386/gthr-win32.h: Define NOGDI before
windows.h include to prevent w32api CC_NONE macro
clash with libgfortran.
From-SVN: r245835
Diffstat (limited to 'libgcc')
| -rw-r--r-- | libgcc/ChangeLog | 6 | ||||
| -rw-r--r-- | libgcc/config/i386/gthr-win32.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 11b1ff9..476f610 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,5 +1,11 @@ 2017-03-02 Jonathan Yong <10walls@gmail.com> + * config/i386/gthr-win32.h: Define NOGDI before + windows.h include to prevent w32api CC_NONE macro + clash with libgfortran. + +2017-03-02 Jonathan Yong <10walls@gmail.com> + * unwind-seh.c: Suppress warnings for RtlUnwindEx calls. 2017-02-16 Andrew Pinski <apinski@cavium.com> diff --git a/libgcc/config/i386/gthr-win32.h b/libgcc/config/i386/gthr-win32.h index 74a524b..246fa5f 100644 --- a/libgcc/config/i386/gthr-win32.h +++ b/libgcc/config/i386/gthr-win32.h @@ -545,6 +545,7 @@ __gthread_recursive_mutex_destroy (__gthread_recursive_mutex_t *__mutex) #else /* ! __GTHREAD_HIDE_WIN32API */ +#define NOGDI #include <windows.h> #include <errno.h> |