diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2016-08-20 16:03:14 +0200 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2016-08-20 17:14:55 +0200 |
| commit | 06ac6718119dfd382c1904b1162f6cd7f9749dc3 (patch) | |
| tree | a13828d9643b846c1488eb16adb868e620c6d532 /winsup/cygwin/include | |
| parent | 5e9b414e1cdb697bd3f437928eb1846054feea4c (diff) | |
| download | cygnal-06ac6718119dfd382c1904b1162f6cd7f9749dc3.tar.gz cygnal-06ac6718119dfd382c1904b1162f6cd7f9749dc3.tar.bz2 cygnal-06ac6718119dfd382c1904b1162f6cd7f9749dc3.zip | |
Only define __getreent inline function when building newlib or Cygwin
Commit 6f3943b erroneously removed the `#ifdef _COMPILING_NEWLIB'
guarding the __getreent inline function. This patch ignored the
fact that config.h is included when building applications, and the
code in question requires internal, auto-generated headers to be
available which are not exposed to user-space.
Reinstantiate defined(_COMPILING_NEWLIB) test and alternatively
check for defined (__INSIDE_CYGWIN__), otherwise we'd have to
reinstantiate the __getreent macro in cygtls.h which is really
confusing.
While testing it turned out that a low number of source codes inside
Cygwin won't see the inline __getreent due to a missing __INSIDE_CYGWIN__
definition. For malloc.cc this was actually deliberate to get different
definitions from including cygmalloc.h. Change this by defining
__INSIDE_CYGWIN__ in malloc.cc but changing the test in cygmalloc.h
to test for defined(DLMALLOC_VERSION). This might need a change if we
ever get around to replace dlmalloc with a newer, more threading-aware
malloc implementation.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'winsup/cygwin/include')
| -rw-r--r-- | winsup/cygwin/include/cygwin/config.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/winsup/cygwin/include/cygwin/config.h b/winsup/cygwin/include/cygwin/config.h index 46c020897..dad6a350b 100644 --- a/winsup/cygwin/include/cygwin/config.h +++ b/winsup/cygwin/include/cygwin/config.h @@ -35,6 +35,7 @@ extern "C" { compute these offsets already exists for the sake of gendef so we might as well just use it here. */ +#if defined (_COMPILING_NEWLIB) || defined (__INSIDE_CYGWIN__) #ifdef __x86_64__ #include "../tlsoffsets64.h" #else @@ -51,6 +52,7 @@ extern inline struct _reent *__getreent (void) #endif return (struct _reent *) (ret + tls_local_clib); } +#endif /* _COMPILING_NEWLIB || __INSIDE_CYGWIN__ */ #ifdef __x86_64__ # define __SYMBOL_PREFIX |