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>

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index f50738e0006ea7ba5e02dd609540752cf3f9eda2..5bbd4b2ef6d289f08da46c80f08a9428298a6833 100644 (file)
--- 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 46411742d03c33f6d22e914609b51b92e2f65871..988e84ce6f8847425bc45dd13603233104d12e0e 100644 (file)
--- 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 4df228ab4db1d9a64f10625ec3710fad42a90e24..fe4fd7b5f8e0d3a44feb5a3efa39b1fef2411710 100644 (file)
--- 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 421232a27e7bddb718fdf3fc3528081f2c7959f0..8bcec05ee578933395e7cbae800c50f343402e8b 100644 (file)
--- 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 c0574e2763b793a0788bd2fb5345ce3d2c590431..d79f3c23dd0209b9e9563ba4c6120d2e1a1ebad4 100644 (file)
--- 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>