diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-02-08 00:06:52 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-02-08 00:06:52 +0100 |
| commit | 189754f96136b0122d286d90de97026e9505fd74 (patch) | |
| tree | 9abfe101717edd79a14a687cc63d747f0b837e8f /include | |
| parent | cd4e0b15ae15226e9995df7eec2d8a340c55a482 (diff) | |
| parent | db4857c035a52a01f337a8ef6fe70ac08ad66ad5 (diff) | |
Merge branch 't/tls' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
include/errno.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/errno.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/errno.h b/include/errno.h index 5b75ffc051..aae94de296 100644 --- a/include/errno.h +++ b/include/errno.h @@ -21,7 +21,7 @@ extern int rtld_errno attribute_hidden; # include <tls.h> -# if !(defined(__GNU__) && defined IS_IN_rtld) +# if !(defined __GNU__ && defined IS_IN_rtld) # undef errno # ifndef NOT_IN_libc # define errno __libc_errno |