From: tip-bot for Arnaldo Carvalho de Melo <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: hpa@zytor.com, dsahern@gmail.com, jolsa@kernel.org,
acme@redhat.com, tglx@linutronix.de, mingo@kernel.org,
adrian.hunter@intel.com, linux-kernel@vger.kernel.org,
namhyung@kernel.org, wangnan0@huawei.com
Subject: [tip:perf/core] perf tools: Remove regex.h and fnmatch.h from util.h
Date: Thu, 20 Apr 2017 04:15:18 -0700 [thread overview]
Message-ID: <tip-ixzm5kuamsq1ixbkuv6kmwzj@git.kernel.org> (raw)
Commit-ID: 1eae20c1d40acf7676aa799b48f747d9b28bf352
Gitweb: http://git.kernel.org/tip/1eae20c1d40acf7676aa799b48f747d9b28bf352
Author: Arnaldo Carvalho de Melo <acme@redhat.com>
AuthorDate: Tue, 18 Apr 2017 12:33:30 -0300
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 19 Apr 2017 13:01:56 -0300
perf tools: Remove regex.h and fnmatch.h from util.h
The users of regex and fnmatch functions should include those headers
instead.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-ixzm5kuamsq1ixbkuv6kmwzj@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/builtin-report.c | 1 +
tools/perf/util/machine.c | 1 +
tools/perf/util/sort.c | 1 +
tools/perf/util/sort.h | 2 +-
tools/perf/util/util.h | 2 --
5 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index f50738e..5bbd4b2 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -41,6 +41,7 @@
#include <dlfcn.h>
#include <errno.h>
#include <inttypes.h>
+#include <regex.h>
#include <linux/bitmap.h>
#include <linux/stringify.h>
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 4641174..988e84c 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -1,6 +1,7 @@
#include <dirent.h>
#include <errno.h>
#include <inttypes.h>
+#include <regex.h>
#include "callchain.h"
#include "debug.h"
#include "event.h"
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 4df228a..fe4fd7b 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -1,5 +1,6 @@
#include <errno.h>
#include <inttypes.h>
+#include <regex.h>
#include <sys/mman.h>
#include "sort.h"
#include "hist.h"
diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h
index 421232a..8bcec05 100644
--- a/tools/perf/util/sort.h
+++ b/tools/perf/util/sort.h
@@ -2,7 +2,7 @@
#define __PERF_SORT_H
#include "../builtin.h"
-#include "util.h"
+#include <regex.h>
#include "color.h"
#include <linux/list.h>
diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
index c0574e2..d79f3c2 100644
--- a/tools/perf/util/util.h
+++ b/tools/perf/util/util.h
@@ -23,9 +23,7 @@
#include <sys/time.h>
#include <time.h>
#include <signal.h>
-#include <fnmatch.h>
#include <assert.h>
-#include <regex.h>
#include <utime.h>
#include <sys/wait.h>
#include <poll.h>
reply other threads:[~2017-04-20 11:17 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-ixzm5kuamsq1ixbkuv6kmwzj@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=dsahern@gmail.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=tglx@linutronix.de \
--cc=wangnan0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®