gthr-win32.h: Define NOGDI before windows.h include to prevent w32api CC_NONE macro...

        * config/i386/gthr-win32.h: Define NOGDI before
        windows.h include to prevent w32api CC_NONE macro
        clash with libgfortran.

From-SVN: r245835

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 11b1ff9f850137da4c230431c2eddf21142a64c4..476f610f92d19c9d955d2257062c84d11dffd4e0 100644 (file)
--- 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 74a524b685feb38ec19e9b53709e9a524db76a08..246fa5fcbbf32af0523355ecd5f4ed64623f2e54 100644 (file)
--- 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>