2011-04-21 Ivan Maidanski <ivmai@mail.ru>

	* include/private/gc_priv.h (_GNU_SOURCE): Revert one of the
	recent patches regarding this macro as the macro should be set
	(to 1) before including any other system header.

diff --git a/ChangeLog b/ChangeLog
index caad631c8b69c0eeb707e20a5aef255595ce8af1..80f1b0cda98344afd54f8cec7bff79e22bd0768e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-21  Ivan Maidanski  <ivmai@mail.ru>
+
+       * include/private/gc_priv.h (_GNU_SOURCE): Revert one of the
+       recent patches regarding this macro as the macro should be set
+       (to 1) before including any other system header.
+
 2011-04-21  Ivan Maidanski  <ivmai@mail.ru>
 
        * doc/README.environment (GC_INITIAL_HEAP_SIZE,

diff --git a/include/private/gc_priv.h b/include/private/gc_priv.h
index b1bb9c78b781e68d430ba667ff9b1b6def64d932..9d97e327769b96db9da7a5ffef27fc492b81d084 100644 (file)
--- a/include/private/gc_priv.h
+++ b/include/private/gc_priv.h
@@ -26,15 +26,11 @@
 # define GC_BUILD
 #endif
 
-#if defined(__linux__) || defined(__GLIBC__) || defined(__GNU__)
+#if (defined(__linux__) || defined(__GLIBC__) || defined(__GNU__)) \
+    && !defined(_GNU_SOURCE)
   /* Can't test LINUX, since this must be defined before other includes. */
-# if !defined(__native_client__)
-#   include <features.h>
-# endif
-# ifndef _GNU_SOURCE
-#   define _GNU_SOURCE 1
-# endif
-#endif /* __linux__ */
+# define _GNU_SOURCE 1
+#endif
 
 #if (defined(DGUX) && defined(GC_THREADS) || defined(DGUX386_THREADS) \
      || defined(GC_DGUX386_THREADS)) && !defined(_USING_POSIX4A_DRAFT10)