diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index d100a1574..db451fb35 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-08  Brian Dessent  <brian@dessent.net>
+
+	* include/cygwin/config.h: Conditionalize inline __getreent()
+	definition on _COMPILING_NEWLIB.
+
 2007-09-06  Brian Dessent  <brian@dessent.net>
 
 	* include/cygwin/config.h (__getreent): Define inline version.
diff --git a/winsup/cygwin/include/cygwin/config.h b/winsup/cygwin/include/cygwin/config.h
index 0c2f157f8..f0f1c8aa8 100644
--- a/winsup/cygwin/include/cygwin/config.h
+++ b/winsup/cygwin/include/cygwin/config.h
@@ -37,9 +37,11 @@ extern "C" {
    compute these offsets already exists for the sake of gendef so
    we might as well just use it here.  */
 
+#ifdef _COMPILING_NEWLIB
 #include "../tlsoffsets.h"
 extern char *_tlsbase __asm__ ("%fs:4");
 #define __getreent() (struct _reent *)(_tlsbase + tls_local_clib)
+#endif  /* _COMPILING_NEWLIB */
 
 #define __FILENAME_MAX__ (260 - 1 /* NUL */)
 #define _READ_WRITE_RETURN_TYPE _ssize_t