Re: [PATCH 3/4] Wrap LFS64 functions only if __GLIBC__
On 05/05/15 14:34, Mauro Carvalho Chehab wrote: I'm afraid that removing the above would break for FreeBSD, as I think it also uses glibc, but not 100% sure. So, either we should get an ack from Hans Peter, or you should change the tests to: #if linux && __GLIBC__ Hi, Linux might be defined when compiling webcamd. The following should be fine: -#ifdef linux +#if defined(linux) && defined(__GLIBC__) Thank you! --HPS -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/4] Wrap LFS64 functions only if __GLIBC__
On 05/05/15 14:34, Mauro Carvalho Chehab wrote: > Em Sun, 25 Jan 2015 21:36:36 +0100 > Felix Janda escreveu: >> -#ifdef linux >> +#ifdef __GLIBC__ > > Hmm... linux was added here to avoid breaking on FreeBSD, on this > changeset: > > So, either we should get an ack from Hans Peter, or you should > change the tests to: > > #if linux && __GLIBC__ That would be needed to not break Debian/kFreeBSD which is a FreeBSD Kernel with GNU C library. -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/4] Wrap LFS64 functions only if __GLIBC__
Em Sun, 25 Jan 2015 21:36:36 +0100
Felix Janda escreveu:
> The functions open64 and mmap64 are glibc specific.
>
> Signed-off-by: Felix Janda
> ---
> lib/libv4l1/v4l1compat.c | 4 ++--
> lib/libv4l2/v4l2convert.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/lib/libv4l1/v4l1compat.c b/lib/libv4l1/v4l1compat.c
> index 282173b..c78adb4 100644
> --- a/lib/libv4l1/v4l1compat.c
> +++ b/lib/libv4l1/v4l1compat.c
> @@ -61,7 +61,7 @@ LIBV4L_PUBLIC int open(const char *file, int oflag, ...)
> return fd;
> }
>
> -#ifdef linux
> +#ifdef __GLIBC__
Hmm... linux was added here to avoid breaking on FreeBSD, on this
changeset:
commit 9026d3cc277e9211a89345846dea95af7208383c
Author: hans@rhel5-devel.localdomain
Date: Tue Jun 2 15:34:34 2009 +0200
libv4l: initial support for compiling on FreeBSD
From: Hans Petter Selasky
I'm afraid that removing the above would break for FreeBSD, as I think
it also uses glibc, but not 100% sure.
So, either we should get an ack from Hans Peter, or you should
change the tests to:
#if linux && __GLIBC__
Regards,
Mauro
> LIBV4L_PUBLIC int open64(const char *file, int oflag, ...)
> {
> int fd;
> @@ -120,7 +120,7 @@ LIBV4L_PUBLIC void *mmap(void *start, size_t length, int
> prot, int flags, int fd
> return v4l1_mmap(start, length, prot, flags, fd, offset);
> }
>
> -#ifdef linux
> +#ifdef __GLIBC__
> LIBV4L_PUBLIC void *mmap64(void *start, size_t length, int prot, int flags,
> int fd,
> off64_t offset)
> {
> diff --git a/lib/libv4l2/v4l2convert.c b/lib/libv4l2/v4l2convert.c
> index c79f9da..9345641 100644
> --- a/lib/libv4l2/v4l2convert.c
> +++ b/lib/libv4l2/v4l2convert.c
> @@ -86,7 +86,7 @@ LIBV4L_PUBLIC int open(const char *file, int oflag, ...)
> return fd;
> }
>
> -#ifdef linux
> +#ifdef __GLIBC__
> LIBV4L_PUBLIC int open64(const char *file, int oflag, ...)
> {
> int fd;
> @@ -148,7 +148,7 @@ LIBV4L_PUBLIC void *mmap(void *start, size_t length, int
> prot, int flags, int fd
> return v4l2_mmap(start, length, prot, flags, fd, offset);
> }
>
> -#ifdef linux
> +#ifdef __GLIBC__
> LIBV4L_PUBLIC void *mmap64(void *start, size_t length, int prot, int flags,
> int fd,
> off64_t offset)
> {
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/4] Wrap LFS64 functions only if __GLIBC__
The functions open64 and mmap64 are glibc specific.
Signed-off-by: Felix Janda
---
lib/libv4l1/v4l1compat.c | 4 ++--
lib/libv4l2/v4l2convert.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/libv4l1/v4l1compat.c b/lib/libv4l1/v4l1compat.c
index 282173b..c78adb4 100644
--- a/lib/libv4l1/v4l1compat.c
+++ b/lib/libv4l1/v4l1compat.c
@@ -61,7 +61,7 @@ LIBV4L_PUBLIC int open(const char *file, int oflag, ...)
return fd;
}
-#ifdef linux
+#ifdef __GLIBC__
LIBV4L_PUBLIC int open64(const char *file, int oflag, ...)
{
int fd;
@@ -120,7 +120,7 @@ LIBV4L_PUBLIC void *mmap(void *start, size_t length, int
prot, int flags, int fd
return v4l1_mmap(start, length, prot, flags, fd, offset);
}
-#ifdef linux
+#ifdef __GLIBC__
LIBV4L_PUBLIC void *mmap64(void *start, size_t length, int prot, int flags,
int fd,
off64_t offset)
{
diff --git a/lib/libv4l2/v4l2convert.c b/lib/libv4l2/v4l2convert.c
index c79f9da..9345641 100644
--- a/lib/libv4l2/v4l2convert.c
+++ b/lib/libv4l2/v4l2convert.c
@@ -86,7 +86,7 @@ LIBV4L_PUBLIC int open(const char *file, int oflag, ...)
return fd;
}
-#ifdef linux
+#ifdef __GLIBC__
LIBV4L_PUBLIC int open64(const char *file, int oflag, ...)
{
int fd;
@@ -148,7 +148,7 @@ LIBV4L_PUBLIC void *mmap(void *start, size_t length, int
prot, int flags, int fd
return v4l2_mmap(start, length, prot, flags, fd, offset);
}
-#ifdef linux
+#ifdef __GLIBC__
LIBV4L_PUBLIC void *mmap64(void *start, size_t length, int prot, int flags,
int fd,
off64_t offset)
{
--
2.0.5
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
