Brad Bishop | 96ff198 | 2019-08-19 13:50:42 -0400 | [diff] [blame^] | 1 | From 29ce9fdab3bd34e69d73b5b890795559c06553f7 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 7 Jan 2016 19:40:08 +0000 |
| 4 | Subject: [PATCH] Check if __GLIBC_PREREQ is defined before using it |
| 5 | |
| 6 | __GLIBC_PREREQ is specific to glibc so it should be checked if it is |
| 7 | defined or not. |
| 8 | |
| 9 | Upstream-Status: Pending |
| 10 | |
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 12 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
| 13 | --- |
| 14 | testcases/kernel/syscalls/accept4/accept4_01.c | 7 +++++++ |
| 15 | 1 file changed, 7 insertions(+) |
| 16 | |
| 17 | diff --git a/testcases/kernel/syscalls/accept4/accept4_01.c b/testcases/kernel/syscalls/accept4/accept4_01.c |
| 18 | index dd289cf..76aa969 100644 |
| 19 | --- a/testcases/kernel/syscalls/accept4/accept4_01.c |
| 20 | +++ b/testcases/kernel/syscalls/accept4/accept4_01.c |
| 21 | @@ -38,6 +38,7 @@ |
| 22 | static struct sockaddr_in conn_addr; |
| 23 | static int listening_fd; |
| 24 | |
| 25 | +#if defined(__GLIBC__) && defined(__GLIBC_PREREQ) |
| 26 | #if !(__GLIBC_PREREQ(2, 10)) |
| 27 | static int |
| 28 | accept4_01(int fd, struct sockaddr *sockaddr, socklen_t *addrlen, int flags) |
| 29 | @@ -56,6 +57,7 @@ accept4_01(int fd, struct sockaddr *sockaddr, socklen_t *addrlen, int flags) |
| 30 | #endif |
| 31 | } |
| 32 | #endif |
| 33 | +#endif |
| 34 | |
| 35 | static int create_listening_socket(void) |
| 36 | { |
| 37 | @@ -115,6 +117,7 @@ static void verify_accept4(unsigned int nr) |
| 38 | SAFE_CONNECT(connfd, (struct sockaddr *)&conn_addr, sizeof(conn_addr)); |
| 39 | addrlen = sizeof(claddr); |
| 40 | |
| 41 | +#if defined(__GLIBC__) && defined(__GLIBC_PREREQ) |
| 42 | #if !(__GLIBC_PREREQ(2, 10)) |
| 43 | TEST(accept4_01(listening_fd, (struct sockaddr *)&claddr, &addrlen, |
| 44 | tcase->cloexec | tcase->nonblock)); |
| 45 | @@ -122,6 +125,10 @@ static void verify_accept4(unsigned int nr) |
| 46 | TEST(accept4(listening_fd, (struct sockaddr *)&claddr, &addrlen, |
| 47 | tcase->cloexec | tcase->nonblock)); |
| 48 | #endif |
| 49 | +#else |
| 50 | + TEST(accept4(listening_fd, (struct sockaddr *)&claddr, &addrlen, |
| 51 | + tcase->cloexec | tcase->nonblock)); |
| 52 | +#endif |
| 53 | if (TST_RET == -1) { |
| 54 | if (TST_ERR == ENOSYS) |
| 55 | tst_brk(TCONF, "syscall __NR_accept4 not supported"); |
| 56 | -- |
| 57 | 2.7.4 |
| 58 | |