From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1814) id BD8E33858D1E; Sun, 25 Dec 2022 01:10:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BD8E33858D1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1671930619; bh=c6wg4DN2Wvzr7wJOjTGYA3wurC3Ihk+iFJD78nFouf4=; h=From:To:Subject:Date:From; b=A1vhzRTklgugqYIZSFbupLNom82tbm/s8AGUSh5vTSFAPZQ+umbPXwPuk99QUmQfD zgGtRuGiPgXTYBwk6GLPml6s+JUDawhIdCvhV3fCAuwn3zBbYYvzX+4G91TkIBa1/e RqmU9+PHVVcJcQnu5WSORaaI0354zog6fu30uzf4= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Yong To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-4888] libgcc: fix gfortran build on Windows X-Act-Checkin: gcc X-Git-Author: Jonathan Yong <10walls@gmail.com> X-Git-Refname: refs/heads/master X-Git-Oldrev: 843c4d2fb4c3ca06566f9779af1a5ba0bdd72c50 X-Git-Newrev: 339db340af2fdeceeb06b2249330bc103e38691c Message-Id: <20221225011019.BD8E33858D1E@sourceware.org> Date: Sun, 25 Dec 2022 01:10:19 +0000 (GMT) List-Id: https://gcc.gnu.org/g:339db340af2fdeceeb06b2249330bc103e38691c commit r13-4888-g339db340af2fdeceeb06b2249330bc103e38691c Author: Jonathan Yong <10walls@gmail.com> Date: Sun Dec 25 01:06:20 2022 +0000 libgcc: fix gfortran build on Windows Broken by 9149a5b7e0a66b7b94d5b7db3194a975d18dea2f. CC_NONE is defined by wingdi.h and conflicting with gcc. Committed as obvious. libgcc/: * config/i386/gthr-win32.h: undef CC_NONE Signed-off-by: Jonathan Yong <10walls@gmail.com> Diff: --- libgcc/config/i386/gthr-win32.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libgcc/config/i386/gthr-win32.h b/libgcc/config/i386/gthr-win32.h index 9485dd50bf9..146357fa436 100644 --- a/libgcc/config/i386/gthr-win32.h +++ b/libgcc/config/i386/gthr-win32.h @@ -93,8 +93,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #endif #define WIN32_LEAN_AND_MEAN #include -/* Now undef the windows BOOL. */ +/* Now undef the windows BOOL and CC_NONE */ #undef BOOL +#undef CC_NONE /* Key structure for maintaining thread specific storage */ static DWORD __gthread_objc_data_tls = TLS_OUT_OF_INDEXES; @@ -604,6 +605,7 @@ __gthread_cond_timedwait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex, #define WIN32_LEAN_AND_MEAN #include +#undef CC_NONE __GTHREAD_WIN32_INLINE int __gthread_detach (__gthread_t __thr)