From 6b6ede3d15f04fe825cfa9f697507457e3640344 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 14 Feb 2015 23:00:19 -0600 Subject: resolve merge --- libc/sysdeps/linux/common/pause.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libc/sysdeps/linux/common/pause.c') diff --git a/libc/sysdeps/linux/common/pause.c b/libc/sysdeps/linux/common/pause.c index c35ecd5d5..95d064ab5 100644 --- a/libc/sysdeps/linux/common/pause.c +++ b/libc/sysdeps/linux/common/pause.c @@ -22,7 +22,7 @@ CANCELLABLE_SYSCALL(int, pause, (void), ()) # include int -# ifdef __LINUXTHREADS_OLD__ +# ifdef __UCLIBC_HAS_LINUXTHREADS__ weak_function # endif __NC(pause)(void) -- cgit v1.2.3