[v4l-utils PATCH 1/1] cec-ctl: Prepare for __inline__ instead of inline

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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.ailus@xxxxxxxxxxxxxxx>
---
 utils/cec-ctl/msg2ctl.pl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/utils/cec-ctl/msg2ctl.pl b/utils/cec-ctl/msg2ctl.pl
index 0e494c5..d95e8af 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);
-- 
2.7.4




[Index of Archives]     [Linux Input]     [Video for Linux]     [Gstreamer Embedded]     [Mplayer Users]     [Linux USB Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux