aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-10-02 07:59:10 -0300
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-10-02 07:59:10 -0300
commit406a4b24752e0d4bc6f2903546efd5f1a7506609 (patch)
treef6261995cf4241e9deece61c5785c29b54176fb9
parentba9395c025e297a9aa953481663fd4fb75a64a1d (diff)
cec: fix cec-log.h dependency issues
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+samsung@kernel.org>
-rw-r--r--utils/cec-follower/cec-follower.h2
-rw-r--r--utils/common/cec-log.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/utils/cec-follower/cec-follower.h b/utils/cec-follower/cec-follower.h
index c3d00269..0bd45452 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 c55d8679..850fc58c 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

Privacy Policy