From db9f7f657e035786836f8371b56d876a9bec46bc Mon Sep 17 00:00:00 2001 From: Jonathan Yong <10walls@gmail.com> Date: Thu, 2 Mar 2017 11:03:23 +0000 Subject: [PATCH] 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 --- libgcc/ChangeLog | 6 ++++++ libgcc/config/i386/gthr-win32.h | 1 + 2 files changed, 7 insertions(+) diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 11b1ff9f850..476f610f92d 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,9 @@ +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. diff --git a/libgcc/config/i386/gthr-win32.h b/libgcc/config/i386/gthr-win32.h index 74a524b685f..246fa5fcbbf 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 #include -- 2.30.2