Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1635161 > unrolled thread

[tip:perf/urgent] perf ui gtk: Move gtk .so name to the only place where it is used

Back to article view | Back to linux.kernel

Contents

  [tip:perf/urgent] perf ui gtk: Move gtk .so name to the only place  where it is used tip-bot for Arnaldo Carvalho de Melo <tipbot@zytor.com> - 2017-05-03 19:40 +0200

#1635161 — [tip:perf/urgent] perf ui gtk: Move gtk .so name to the only place where it is used

Commit-ID:  5068b52f732157385d9dccd205bc4043da3a3cce
Gitweb:     http://git.kernel.org/tip/5068b52f732157385d9dccd205bc4043da3a3cce
Author:     Arnaldo Carvalho de Melo <acme@redhat.com>
AuthorDate: Wed, 26 Apr 2017 15:31:57 -0300
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 26 Apr 2017 15:31:57 -0300

perf ui gtk: Move gtk .so name to the only place where it is used

No need to pollute util.h with this.

Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/n/tip-kec0chbdtgrd71o3oi2kz2zt@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/ui/setup.c  | 3 +++
 tools/perf/util/util.h | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/perf/ui/setup.c b/tools/perf/ui/setup.c
index 5ea0b40..caf1ce6 100644
--- a/tools/perf/ui/setup.c
+++ b/tools/perf/ui/setup.c
@@ -10,7 +10,10 @@ pthread_mutex_t ui__lock = PTHREAD_MUTEX_INITIALIZER;
 void *perf_gtk_handle;
 int use_browser = -1;
 
+#define PERF_GTK_DSO "libperf-gtk.so"
+
 #ifdef HAVE_GTK2_SUPPORT
+
 static int setup_gtk_browser(void)
 {
 	int (*perf_ui_init)(void);
diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
index 622c2d2..dabdc81 100644
--- a/tools/perf/util/util.h
+++ b/tools/perf/util/util.h
@@ -22,8 +22,6 @@
 #endif
 #endif
 
-#define PERF_GTK_DSO  "libperf-gtk.so"
-
 /* General helper functions */
 void usage(const char *err) NORETURN;
 void die(const char *err, ...) NORETURN __attribute__((format (printf, 1, 2)));

[toc] | [standalone]

Back to top | Article view | linux.kernel

csiph-web