This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: cec: fix cec-log.h dependency issues Author: Mauro Carvalho Chehab <mchehab+sams...@kernel.org> Date: Wed Oct 2 07:59:10 2019 -0300 Due to a reorg, cec-log.h has now a different meaning and it is placed on a different directory: utils/common/cec-log.h. The problem is that it now conflicts with the old auto-generated one at the utils/cec-follower directory. This won't affect new clones, but if someone updates v4l-utils, the build will fail without explicitly removing the old file. So, let's change the includes for them to explicitly pinpoint to the right cec-log.h file. This way, if the old one exists, it won't cause any build breakages. Signed-off-by: Mauro Carvalho Chehab <mchehab+sams...@kernel.org> utils/cec-follower/cec-follower.h | 2 +- utils/common/cec-log.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=406a4b24752e0d4bc6f2903546efd5f1a7506609 diff --git a/utils/cec-follower/cec-follower.h b/utils/cec-follower/cec-follower.h index c3d0026980b3..0bd4545295d0 100644 --- a/utils/cec-follower/cec-follower.h +++ b/utils/cec-follower/cec-follower.h @@ -22,7 +22,7 @@ #endif #include <cec-info.h> -#include <cec-log.h> +#include "../common/cec-log.h" #define ARRAY_SIZE(a) \ (sizeof(a) / sizeof(*a)) diff --git a/utils/common/cec-log.cpp b/utils/common/cec-log.cpp index c55d86797b51..850fc58c4816 100644 --- a/utils/common/cec-log.cpp +++ b/utils/common/cec-log.cpp @@ -13,7 +13,7 @@ #include <linux/cec-funcs.h> #include "cec-htng-funcs.h" #include "cec-info.h" -#include "cec-log.h" +#include "../common/cec-log.h" #define CEC_MAX_ARGS 16 _______________________________________________ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
