summaryrefslogtreecommitdiff
path: root/libpthread/nptl
diff options
context:
space:
mode:
authorEd Wildgoose <ed+git@wildgooses.com>2020-06-16 15:00:56 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2020-07-02 08:25:47 +0200
commit93277314f0ec84409e15f6e2cd616d028cb53065 (patch)
tree8d1700eaf083f9cf364eeb6f99a4845e9aeb3210 /libpthread/nptl
parenta852c9941054d2cb5e50964cb9ddb975b5d11689 (diff)
Rename __unused struct members to include a namespace
Rename various spare fields in structs to include a namespace This should avoid accidental clashes with uses of the __unused symbol in upstream projects. eg currently it causes a compile error in dhcpcd 8.x due to their re-use of the __unused symbol as a macro This follows the style of glibc which does something equivalent
Diffstat (limited to 'libpthread/nptl')
-rw-r--r--libpthread/nptl/sysdeps/i386/tls.h2
-rw-r--r--libpthread/nptl/sysdeps/x86_64/tls.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/libpthread/nptl/sysdeps/i386/tls.h b/libpthread/nptl/sysdeps/i386/tls.h
index 17c80e5fc..63c77c561 100644
--- a/libpthread/nptl/sysdeps/i386/tls.h
+++ b/libpthread/nptl/sysdeps/i386/tls.h
@@ -55,7 +55,7 @@ typedef struct
#ifndef __ASSUME_PRIVATE_FUTEX
int private_futex;
#else
- int __unused1;
+ int __uclibc_unused1;
#endif
/* Reservation of some values for the TM ABI. */
void *__private_tm[5];
diff --git a/libpthread/nptl/sysdeps/x86_64/tls.h b/libpthread/nptl/sysdeps/x86_64/tls.h
index d8b82ede9..41b3c3bf6 100644
--- a/libpthread/nptl/sysdeps/x86_64/tls.h
+++ b/libpthread/nptl/sysdeps/x86_64/tls.h
@@ -58,7 +58,7 @@ typedef struct
# ifndef __ASSUME_PRIVATE_FUTEX
int private_futex;
# else
- int __unused1;
+ int __uclibc_unused1;
# endif
# if __WORDSIZE == 64
int rtld_must_xmm_save;
@@ -66,7 +66,7 @@ typedef struct
/* Reservation of some values for the TM ABI. */
void *__private_tm[5];
# if __WORDSIZE == 64
- long int __unused2;
+ long int __uclibc_unused2;
/* Have space for the post-AVX register size. */
__m128 rtld_savespace_sse[8][4];