summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortrav90 <travawine@palemoon.org>2018-12-01 13:42:38 -0600
committertrav90 <travawine@palemoon.org>2018-12-01 13:42:38 -0600
commit1f8a1f3fdb69a5a7ed54a9ebf089808d48594587 (patch)
tree44210db7e88d120099cfaa86f4f6731f7985d03f
parentf8e83e7e6dacb7fe00ccb52f62af634bc05dbdfc (diff)
downloadUXP-1f8a1f3fdb69a5a7ed54a9ebf089808d48594587.tar
UXP-1f8a1f3fdb69a5a7ed54a9ebf089808d48594587.tar.gz
UXP-1f8a1f3fdb69a5a7ed54a9ebf089808d48594587.tar.lz
UXP-1f8a1f3fdb69a5a7ed54a9ebf089808d48594587.tar.xz
UXP-1f8a1f3fdb69a5a7ed54a9ebf089808d48594587.zip
Clear HAVE_LINUX_PERF_EVENT_H defines in ffvpx config before setting them for lib use
-rw-r--r--media/ffvpx/config_unix32.h3
-rw-r--r--media/ffvpx/config_unix64.h3
2 files changed, 6 insertions, 0 deletions
diff --git a/media/ffvpx/config_unix32.h b/media/ffvpx/config_unix32.h
index ae49d8075..172205963 100644
--- a/media/ffvpx/config_unix32.h
+++ b/media/ffvpx/config_unix32.h
@@ -213,6 +213,9 @@
#define HAVE_ES2_GL_H 0
#define HAVE_GSM_H 0
#define HAVE_IO_H 0
+#ifdef HAVE_LINUX_PERF_EVENT_H
+#undef HAVE_LINUX_PERF_EVENT_H
+#endif
#define HAVE_LINUX_PERF_EVENT_H 0
#define HAVE_MACHINE_IOCTL_BT848_H 0
#define HAVE_MACHINE_IOCTL_METEOR_H 0
diff --git a/media/ffvpx/config_unix64.h b/media/ffvpx/config_unix64.h
index 1c5c4cb4c..338b6692f 100644
--- a/media/ffvpx/config_unix64.h
+++ b/media/ffvpx/config_unix64.h
@@ -213,6 +213,9 @@
#define HAVE_ES2_GL_H 0
#define HAVE_GSM_H 0
#define HAVE_IO_H 0
+#ifdef HAVE_LINUX_PERF_EVENT_H
+#undef HAVE_LINUX_PERF_EVENT_H
+#endif
#define HAVE_LINUX_PERF_EVENT_H 0
#define HAVE_MACHINE_IOCTL_BT848_H 0
#define HAVE_MACHINE_IOCTL_METEOR_H 0