[glibc/siddhesh/realpath-and-getcwd] htl: Fix build error in annexc

[glibc/siddhesh/realpath-and-getcwd] htl: Fix build error in annexc

[Siddhesh Poyarekar]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=f8b765bec44e6c464a7eabf80e58c6851ca15ac3

commit f8b765bec44e6c464a7eabf80e58c6851ca15ac3
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Mon Jan 17 23:18:20 2022 +0000

    htl: Fix build error in annexc
    
    We were getting
    
    ../scripts/evaluate-test.sh posix/annexc $? true false > /usr/src/glibc-upstream/build/posix/annexc.test-result
    In file included from ../include/pthread.h:1,
                     from <stdin>:1:
    ../sysdeps/htl/include/pthread.h:7:62: error: missing binary operator before token "("
        7 | # if defined __USE_EXTERN_INLINES && defined _LIBC && !IS_IN (libsupport)
          |                                                              ^

Diff:
---
 sysdeps/htl/include/pthread.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sysdeps/htl/include/pthread.h b/sysdeps/htl/include/pthread.h
index f040c2f957..699fabfbc8 100644
--- a/sysdeps/htl/include/pthread.h
+++ b/sysdeps/htl/include/pthread.h
@@ -4,8 +4,9 @@
 
 # define ARCH_MIN_GUARD_SIZE 0
 
-# if defined __USE_EXTERN_INLINES && defined _LIBC && !IS_IN (libsupport)
-#  include <bits/spin-lock-inline.h>
+# if defined __USE_EXTERN_INLINES && defined _LIBC
+#  if !IS_IN (libsupport)
+#   include <bits/spin-lock-inline.h>
 
 __extern_inline int
 pthread_spin_destroy (pthread_spinlock_t *__lock)
@@ -36,6 +37,7 @@ pthread_spin_unlock (pthread_spinlock_t *__lock)
 {
   return __pthread_spin_unlock (__lock);
 }
+#  endif
 # endif
 #endif
 #endif