| From 1ce47a6ed811fd78ed04ea2f82e6321c6bca57b6 Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Thu, 7 Jan 2016 19:40:08 +0000 |
| Subject: [PATCH] Check if __GLIBC_PREREQ is defined before using it |
| |
| __GLIBC_PREREQ is specific to glibc so it should be checked if it is |
| defined or not. |
| |
| Upstream-Status: Pending |
| |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
| |
| --- |
| testcases/kernel/syscalls/accept4/accept4_01.c | 7 +++++++ |
| 1 file changed, 7 insertions(+) |
| |
| diff --git a/testcases/kernel/syscalls/accept4/accept4_01.c b/testcases/kernel/syscalls/accept4/accept4_01.c |
| index 29e18f27d..07444a46f 100644 |
| --- a/testcases/kernel/syscalls/accept4/accept4_01.c |
| +++ b/testcases/kernel/syscalls/accept4/accept4_01.c |
| @@ -38,6 +38,7 @@ |
| static struct sockaddr_in *conn_addr, *accept_addr; |
| static int listening_fd; |
| |
| +#if defined(__GLIBC__) && defined(__GLIBC_PREREQ) |
| #if !(__GLIBC_PREREQ(2, 10)) |
| static int |
| accept4_01(int fd, struct sockaddr *sockaddr, socklen_t *addrlen, int flags) |
| @@ -56,6 +57,7 @@ accept4_01(int fd, struct sockaddr *sockaddr, socklen_t *addrlen, int flags) |
| #endif |
| } |
| #endif |
| +#endif |
| |
| static int create_listening_socket(void) |
| { |
| @@ -114,12 +116,17 @@ static void verify_accept4(unsigned int nr) |
| SAFE_CONNECT(connfd, (struct sockaddr *)conn_addr, sizeof(*conn_addr)); |
| addrlen = sizeof(*accept_addr); |
| |
| +#if defined(__GLIBC__) && defined(__GLIBC_PREREQ) |
| #if !(__GLIBC_PREREQ(2, 10)) |
| TEST(accept4_01(listening_fd, (struct sockaddr *)accept_addr, &addrlen, |
| tcase->cloexec | tcase->nonblock)); |
| #else |
| TEST(accept4(listening_fd, (struct sockaddr *)accept_addr, &addrlen, |
| tcase->cloexec | tcase->nonblock)); |
| +#endif |
| +#else |
| + TEST(accept4(listening_fd, (struct sockaddr *)&claddr, &addrlen, |
| + tcase->cloexec | tcase->nonblock)); |
| #endif |
| if (TST_RET == -1) { |
| if (TST_ERR == ENOSYS) |