[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <ZC87E1QjLjGshw9i@kernel.org>
Date: Thu, 6 Apr 2023 18:35:15 -0300
From: Arnaldo Carvalho de Melo <acme@...nel.org>
To: "Liam R. Howlett" <Liam.Howlett@...cle.com>
Cc: Miguel Ojeda <miguel.ojeda.sandonis@...il.com>,
"linux-perf-users@...r.kernel.org" <linux-perf-users@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"llvm@...ts.linux.dev" <llvm@...ts.linux.dev>,
"linux-sparse@...r.kernel.org" <linux-sparse@...r.kernel.org>,
Peter Zijlstra <peterz@...radead.org>,
Ingo Molnar <mingo@...hat.com>,
Mark Rutland <mark.rutland@....com>,
Miguel Ojeda <ojeda@...nel.org>,
Rasmus Villemoes <linux@...musvillemoes.dk>,
Arnaldo Carvalho de Melo <acme@...hat.com>,
Nathan Chancellor <nathan@...nel.org>,
Nick Desaulniers <ndesaulniers@...gle.com>,
Tom Rix <trix@...hat.com>
Subject: Re: [PATCH] tools: Rename __fallthrough to fallthrough
Em Thu, Apr 06, 2023 at 06:32:42PM -0300, Arnaldo Carvalho de Melo escreveu:
> Em Thu, Apr 06, 2023 at 06:31:32PM -0300, Arnaldo Carvalho de Melo escreveu:
> > from /usr/include/glib-2.0/gio/giotypes.h:30,
> > from /usr/include/glib-2.0/gio/gio.h:28,
> > from /usr/include/gtk-2.0/gdk/gdkapplaunchcontext.h:30,
> > from /usr/include/gtk-2.0/gdk/gdk.h:32,
> > from /usr/include/gtk-2.0/gtk/gtk.h:32,
> > from ui/gtk/gtk.h:8,
> > from ui/gtk/helpline.c:6:
> > /usr/include/glib-2.0/glib/gmacros.h:637:28: error: missing ')' after "__has_attribute"
> > 637 | #if g_macro__has_attribute(fallthrough)
> > | ^~~~~~~~~~~
>
> I'm now trying with:
>
> diff --git a/tools/perf/ui/gtk/browser.c b/tools/perf/ui/gtk/browser.c
> index 8f3e43d148a8560b..d2dadf3873fbdf41 100644
> --- a/tools/perf/ui/gtk/browser.c
> +++ b/tools/perf/ui/gtk/browser.c
> @@ -1,9 +1,9 @@
> // SPDX-License-Identifier: GPL-2.0
> +#include "gtk.h"
> #include "../evsel.h"
> #include "../sort.h"
> #include "../hist.h"
> #include "../helpline.h"
> -#include "gtk.h"
Some more was needed, folding it with your patch.
- Arnaldo
diff --git a/tools/perf/ui/gtk/browser.c b/tools/perf/ui/gtk/browser.c
index 8f3e43d148a8560b..d2dadf3873fbdf41 100644
--- a/tools/perf/ui/gtk/browser.c
+++ b/tools/perf/ui/gtk/browser.c
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: GPL-2.0
+#include "gtk.h"
#include "../evsel.h"
#include "../sort.h"
#include "../hist.h"
#include "../helpline.h"
-#include "gtk.h"
#include <signal.h>
diff --git a/tools/perf/ui/gtk/helpline.c b/tools/perf/ui/gtk/helpline.c
index e40a006aead87b9b..8ea95898a5bd0295 100644
--- a/tools/perf/ui/gtk/helpline.c
+++ b/tools/perf/ui/gtk/helpline.c
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: GPL-2.0
+#include "gtk.h"
#include <stdio.h>
#include <string.h>
#include <linux/kernel.h>
-#include "gtk.h"
#include "../ui.h"
#include "../helpline.h"
diff --git a/tools/perf/ui/gtk/hists.c b/tools/perf/ui/gtk/hists.c
index c83be2d57f7eb7a7..bae21f336ae6d576 100644
--- a/tools/perf/ui/gtk/hists.c
+++ b/tools/perf/ui/gtk/hists.c
@@ -1,4 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
+#include "gtk.h"
#include "../evlist.h"
#include "../callchain.h"
#include "../evsel.h"
@@ -6,7 +7,6 @@
#include "../hist.h"
#include "../helpline.h"
#include "../string2.h"
-#include "gtk.h"
#include <signal.h>
#include <stdlib.h>
#include <linux/string.h>
Powered by blists - more mailing lists