[Emacs-diffs] master 6ae0a50: Disable __attribute__ ((cold)) on MinGW

[Paul Eggert]

branch: master
commit 6ae0a50bc881e7b710a828ac89b5d1f834edac85
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Disable __attribute__ ((cold)) on MinGW
    
    * src/conf_post.h (ATTRIBUTE_COLD) [__MINGW32__]:
    Define to empty on this platform.
---
 src/conf_post.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/conf_post.h b/src/conf_post.h
index 7699d2c..4af1ba9 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -59,7 +59,7 @@ along with GNU Emacs.  If not, see 
<https://www.gnu.org/licenses/>.  */
    into the same 1-, 2-, or 4-byte allocation unit in the MinGW
    builds.  It was also needed to port to pre-C99 compilers, although
    we don't care about that any more.  */
-#if NS_IMPL_GNUSTEP || defined(__MINGW32__)
+#if NS_IMPL_GNUSTEP || defined __MINGW32__
 typedef unsigned int bool_bf;
 #else
 typedef bool bool_bf;
@@ -225,7 +225,9 @@ extern void _DebPrint (const char *fmt, ...);
 extern char *emacs_getenv_TZ (void);
 extern int emacs_setenv_TZ (char const *);
 
-#if __has_attribute (cold)
+/* Avoid __attribute__ ((cold)) on MinGW; see thread starting at
+   <https://lists.gnu.org/r/emacs-devel/2019-04/msg01152.html>. */
+#if __has_attribute (cold) && !defined __MINGW32__
 # define ATTRIBUTE_COLD __attribute__ ((cold))
 #else
 # define ATTRIBUTE_COLD