diff options
| author | Thomas Schwinge <thomas@schwinge.name> | 2015-01-21 22:04:35 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@schwinge.name> | 2015-01-21 22:04:35 +0100 |
| commit | befe7362ecf114c057355d8303bb9718b5133db2 (patch) | |
| tree | 160514dc56ad4dec200683ab500ba1b61e297c3e /include | |
| parent | 89502430391de303d858423ec70670f2191daac9 (diff) | |
| parent | 5d8116626e131b26c25bce6173badfd78ce36786 (diff) | |
Merge remote-tracking branch 'refs/remotes/savannah/top-bases/tschwinge/Roger_Whittaker' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
Versions.def
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 effa593a27..5b75ffc051 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__) +# if !(defined(__GNU__) && defined IS_IN_rtld) # undef errno # ifndef NOT_IN_libc # define errno __libc_errno |