>From 2e3f0c910896a52ce0944bd04d4da3413682cf1f Mon Sep 17 00:00:00 2001
From: Paul Eggert <address@hidden>
Date: Wed, 6 May 2020 15:51:49 -0700
Subject: [PATCH 3/3] * m4/gnulib-common.m4 (gl_COMMON_BODY): Minor style
 fixes.

---
 ChangeLog           | 2 ++
 m4/gnulib-common.m4 | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e2b1bfb56..0e0cc81ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2020-05-06  Paul Eggert  <address@hidden>
 
+	* m4/gnulib-common.m4 (gl_COMMON_BODY): Minor style fixes.
+
 	* lib/attribute.h: Minor style fixes.
 
 	Fix version-etc glitch on OpenIndiana
diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4
index b0010d0e3..79771599b 100644
--- a/m4/gnulib-common.m4
+++ b/m4/gnulib-common.m4
@@ -122,7 +122,7 @@ AC_DEFUN([gl_COMMON_BODY], [
 /* Avoid __attribute__ ((cold)) on MinGW; see thread starting at
    <https://lists.gnu.org/r/emacs-devel/2019-04/msg01152.html>. */
 #if _GL_HAS_ATTRIBUTE (cold) && !defined __MINGW32__
-# define _GL_ATTRIBUTE_COLD __attribute__ ((cold))
+# define _GL_ATTRIBUTE_COLD __attribute__ ((__cold__))
 #else
 # define _GL_ATTRIBUTE_COLD
 #endif
@@ -142,8 +142,8 @@ AC_DEFUN([gl_COMMON_BODY], [
 #endif
 
 #if _GL_HAS_ATTRIBUTE (error)
-# define _GL_ATTRIBUTE_ERROR(msg) __attribute__((__error__ (msg)))
-# define _GL_ATTRIBUTE_WARNING(msg) __attribute__((__warning__ (msg)))
+# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__error__ (msg)))
+# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__warning__ (msg)))
 #else
 # define _GL_ATTRIBUTE_ERROR(msg)
 # define _GL_ATTRIBUTE_WARNING(msg)
-- 
2.17.1