Avoid conflict of HAVE_VALGRIND_VALGRIND_H definition with upper-level definition. draft
authorISHIKAWA, Chiaki <ishikawa@yk.rim.or.jp>
Sat, 09 Nov 2019 11:00:25 +0900
changeset 81078 3ea553d1a739a8a3ad38cd3eb73ba1868635e852
parent 81077 112f0311755582258d5b934636bdf26ac3f27189
child 81079 e9d66487de46fc4f2a46c221ec2474ae5cf76fe9
push id9744
push userishikawa@yk.rim.or.jp
push dateSat, 09 Nov 2019 02:01:06 +0000
treeherdertry-comm-central@56c83244ac0e [default view] [failures only]
Avoid conflict of HAVE_VALGRIND_VALGRIND_H definition with upper-level definition.
mozilla-M-C-016-ffvpx-config-unix64-remove-HAVE_VALGRIND_VALGRIND_H.patch
new file mode 100644
--- /dev/null
+++ b/mozilla-M-C-016-ffvpx-config-unix64-remove-HAVE_VALGRIND_VALGRIND_H.patch
@@ -0,0 +1,27 @@
+# HG changeset patch
+# User ISHIKAWA, Chiaki <ishikawa@yk.rim.or.jp>
+# Parent  270e38bde0892e4b8eff0afc3ffe07ed96a7a72f
+Avoid conflict of HAVE_VALGRIND_VALGRIND_H definition with upper-level definition.
+
+diff --git a/media/ffvpx/config_unix64.h b/media/ffvpx/config_unix64.h
+--- a/media/ffvpx/config_unix64.h
++++ b/media/ffvpx/config_unix64.h
+@@ -237,17 +237,17 @@
+ #define HAVE_SYS_SELECT_H 1
+ #define HAVE_SYS_SOUNDCARD_H 1
+ #define HAVE_SYS_TIME_H 1
+ #define HAVE_SYS_UN_H 1
+ #define HAVE_SYS_VIDEOIO_H 0
+ #define HAVE_TERMIOS_H 1
+ #define HAVE_UDPLITE_H 0
+ #define HAVE_UNISTD_H 1
+-#define HAVE_VALGRIND_VALGRIND_H 0
++// avoid conflict: #define HAVE_VALGRIND_VALGRIND_H 0
+ #define HAVE_WINDOWS_H 0
+ #define HAVE_WINSOCK2_H 0
+ #define HAVE_INTRINSICS_NEON 0
+ #define HAVE_ATANF 1
+ #define HAVE_ATAN2F 1
+ #define HAVE_CBRT 1
+ #define HAVE_CBRTF 1
+ #define HAVE_COPYSIGN 1