]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
htl: Fix build error in annexc
authorSamuel Thibault <samuel.thibault@ens-lyon.org>
Mon, 17 Jan 2022 23:18:20 +0000 (23:18 +0000)
committerSamuel Thibault <samuel.thibault@ens-lyon.org>
Mon, 17 Jan 2022 23:18:27 +0000 (23:18 +0000)
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)
      |                                                              ^

sysdeps/htl/include/pthread.h

index f040c2f9574fb35952481b10df29a88ed859c3f4..699fabfbc8c6c25dc69992003d9a58765e9b886a 100644 (file)
@@ -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