Skip to contentSkip to conversation

v4l-utils: include cstdlib for std::exit

PATCH In review Nick Desaulniers 1 participant 2 messages Jul 24 – Jul 31 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 v4l-utils: include cstdlib for std::exit

libc++ recently trimmed their list of transitive includes. Include <cstdlib> for the declaration of std::exit to avoid compile time errors against newer versions of libc++.

Fixes:

    v4l-utils/utils/v4l2-compliance/v4l2-test-input-output.cpp:53:11:
    error: no member named 'exit' in namespace 'std'; did you mean simply
    'exit'?
       53 |                         return fail("couldn't get freq band\n");
          |                                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    v4l-utils/utils/v4l2-compliance/v4l2-compliance.h:286:3: note:
    expanded from macro 'fail'
      286 |                 std::exit(EXIT_FAILURE);
          |                 ^    ~~~~
    bionic/libc/include/stdlib.h:55:17: note: 'exit' declared here
       55 | __noreturn void exit(int __status);
          |                 ^

---
Changes in v2:
- Also fixup v4l2-ctl.h; many .cpp files including it refer to
std::exit, not exit.
- Link to v1: https://lore.kernel.org/r/[email protected]

---
 utils/v4l2-compliance/v4l2-compliance.h | 1 +
 utils/v4l2-ctl/v4l2-ctl.h               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
utils/v4l2-compliance/v4l2-compliance.h +1 -0
index b43c5817..7ca4744e 100644
@@ -25,6 +25,7 @@
 #include <set>
 #include <string>
 #include <cstdint>
+#include <cstdlib>
 
 #include <linux/videodev2.h>
 #include <linux/v4l2-subdev.h>
utils/v4l2-ctl/v4l2-ctl.h +1 -1
index ae6f43f3..483b2c36 100644
@@ -2,9 +2,9 @@
 #define _V4L2_CTL_H
 
 #include <cstdint>
+#include <cstdlib>
 #include <linux/videodev2.h>
 #include <linux/v4l2-subdev.h>
-#include <stdlib.h>
 #include <v4l-getsubopt.h>
 
 #include <v4l2-info.h>

---
base-commit: b32589c514810daacc05a2015d205b997cd11970
change-id: 20260717-libcpp_transitive-0c6a9e39e5f9

Best regards,

Signature · 1 line
Nick Desaulniers <[email protected]>
#1 lore raw

Hi Hans and Mauro, can one of you pick this up, please? I probably should have cc'ed you explicitly. First time sending a patch to linux-media; don't recall now if b4 prep --auto-to-cc worked or not when I sent this.

https://patchwork.linuxtv.org/project/linux-media/patch/[email protected]/

Quoted 67 lines · Nick Desaulniers

libc++ recently trimmed their list of transitive includes. Include <cstdlib> for the declaration of std::exit to avoid compile time errors against newer versions of libc++.

Fixes:

    v4l-utils/utils/v4l2-compliance/v4l2-test-input-output.cpp:53:11:
    error: no member named 'exit' in namespace 'std'; did you mean simply
    'exit'?
       53 |                         return fail("couldn't get freq band\n");
          |                                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    v4l-utils/utils/v4l2-compliance/v4l2-compliance.h:286:3: note:
    expanded from macro 'fail'
      286 |                 std::exit(EXIT_FAILURE);
          |                 ^    ~~~~
    bionic/libc/include/stdlib.h:55:17: note: 'exit' declared here
       55 | __noreturn void exit(int __status);
          |                 ^

---
Changes in v2:
- Also fixup v4l2-ctl.h; many .cpp files including it refer to
std::exit, not exit.
- Link to v1: https://lore.kernel.org/r/[email protected]

---
 utils/v4l2-compliance/v4l2-compliance.h | 1 +
 utils/v4l2-ctl/v4l2-ctl.h               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
utils/v4l2-compliance/v4l2-compliance.h +1 -0
index b43c5817..7ca4744e 100644
@@ -25,6 +25,7 @@
 #include <set>
 #include <string>
 #include <cstdint>
+#include <cstdlib>
 
 #include <linux/videodev2.h>
 #include <linux/v4l2-subdev.h>
utils/v4l2-ctl/v4l2-ctl.h +1 -2
index ae6f43f3..483b2c36 100644
@@ -2,9 +2,9 @@
 #define _V4L2_CTL_H
 
 #include <cstdint>
+#include <cstdlib>
 #include <linux/videodev2.h>
 #include <linux/v4l2-subdev.h>
-#include <stdlib.h>
 #include <v4l-getsubopt.h>
 
 #include <v4l2-info.h>
 
---

base-commit: b32589c514810daacc05a2015d205b997cd11970
change-id: 20260717-libcpp_transitive-0c6a9e39e5f9

Best regards,
--
Nick Desaulniers <[email protected]>

Signature · 2 lines
Thanks,
~Nick Desaulniers