Skip to content

Commit 5fea5e3

Browse files
committed
configure: rename POSIX ioctl check
Commit 00b64fc introduced configure detection for HAVE_POSIX_IOCTL but unfortunately this conflicts with v4l-utils version 1.30, which itself checks for #ifdef HAVE_POSIX_IOCTL in a public header and erroneously determines it to be true because we define this to be 0. Since this is only used for avdevice/v4l2, we rename this to something else, namely ioctl_posix, simply to prevent the name conflict with the file /usr/include/libv4l2.h at least until they can upstream a fix on their end. Signed-off-by: Leo Izen <[email protected]>
1 parent ebcf2dc commit 5fea5e3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2533,6 +2533,7 @@ HAVE_LIST="
25332533
$TOOLCHAIN_FEATURES
25342534
$TYPES_LIST
25352535
gzip
2536+
ioctl_posix
25362537
libdrm_getfb2
25372538
makeinfo
25382539
makeinfo_html
@@ -2545,7 +2546,6 @@ HAVE_LIST="
25452546
opencl_videotoolbox
25462547
perl
25472548
pod2man
2548-
posix_ioctl
25492549
texi2html
25502550
xmllint
25512551
zlib_gzip
@@ -7275,7 +7275,7 @@ xmllint --version > /dev/null 2>&1 && enable xmllint || disable xmllint
72757275
check_headers linux/fb.h
72767276
check_headers linux/videodev2.h
72777277
test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
7278-
test_code cc sys/ioctl.h "int ioctl(int, int, ...)" && enable posix_ioctl
7278+
test_code cc sys/ioctl.h "int ioctl(int, int, ...)" && enable ioctl_posix
72797279

72807280
# check V4L2 codecs available in the API
72817281
if enabled v4l2_m2m; then

libavdevice/v4l2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ struct video_data {
111111
int (*open_f)(const char *file, int oflag, ...);
112112
int (*close_f)(int fd);
113113
int (*dup_f)(int fd);
114-
#if HAVE_POSIX_IOCTL
114+
#if HAVE_IOCTL_POSIX
115115
int (*ioctl_f)(int fd, int request, ...);
116116
#else
117117
int (*ioctl_f)(int fd, unsigned long int request, ...);

0 commit comments

Comments
 (0)