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-ctl: Prepare for __inline__ instead of inline Author: Sakari Ailus <sakari.ai...@linux.intel.com> Date: Wed Apr 4 17:51:56 2018 +0300 Once formatted for user space consumption, inlined functions in include/uapi/linux/cec-funcs.h have "__inline__" modifier instead of "inline" at least in some circumstances. msg2ctl.pl gets confused of __inline__, allow both to avoid trouble. Signed-off-by: Sakari Ailus <sakari.ai...@linux.intel.com> Signed-off-by: Hans Verkuil <hans.verk...@cisco.com> utils/cec-ctl/msg2ctl.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=47d43b130dc6e9e0edc900759fb37649208371e4 diff --git a/utils/cec-ctl/msg2ctl.pl b/utils/cec-ctl/msg2ctl.pl index 0e494c543bd0..d95e8af4088c 100755 --- a/utils/cec-ctl/msg2ctl.pl +++ b/utils/cec-ctl/msg2ctl.pl @@ -383,14 +383,14 @@ while (<>) { next if /^\s*$/; next if /cec_msg_reply_feature_abort/; next if /cec_msg_htng_init/; - if (/^static inline void cec_msg.*\(.*\)/) { - s/static\sinline\svoid\s//; + if (/^static (__)?inline(__)? void cec_msg.*\(.*\)/) { + s/static\s(__)?inline(__)?\svoid\s//; s/struct cec_msg \*msg, //; s/struct cec_msg \*msg//; process_func($feature, $_); next; } - if (/^static inline void cec_msg/) { + if (/^static (__)?inline(__)? void cec_msg/) { $func = $_; next; } @@ -398,7 +398,7 @@ while (<>) { $func .= $_; next unless /\)$/; $func =~ s/\s+/ /g; - $func =~ s/static\sinline\svoid\s//; + $func =~ s/static\s(__)?inline(__)?\svoid\s//; $func =~ s/struct cec_msg \*msg, //; $func =~ s/struct cec_msg \*msg//; process_func($feature, $func); _______________________________________________ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
