From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753548AbdECRhd (ORCPT ); Wed, 3 May 2017 13:37:33 -0400 Received: from terminus.zytor.com ([65.50.211.136]:55525 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751880AbdECRhZ (ORCPT ); Wed, 3 May 2017 13:37:25 -0400 Date: Wed, 3 May 2017 10:36:16 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: hpa@zytor.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, jolsa@kernel.org, acme@redhat.com, mingo@kernel.org, namhyung@kernel.org Reply-To: namhyung@kernel.org, mingo@kernel.org, acme@redhat.com, jolsa@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf ui gtk: Move gtk .so name to the only place where it is used Git-Commit-ID: 5068b52f732157385d9dccd205bc4043da3a3cce X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 5068b52f732157385d9dccd205bc4043da3a3cce Gitweb: http://git.kernel.org/tip/5068b52f732157385d9dccd205bc4043da3a3cce Author: Arnaldo Carvalho de Melo AuthorDate: Wed, 26 Apr 2017 15:31:57 -0300 Committer: Arnaldo Carvalho de Melo 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 Cc: Namhyung Kim Link: http://lkml.kernel.org/n/tip-kec0chbdtgrd71o3oi2kz2zt@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- 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)));