2009-10-06 Ivan Maidanski <ivmai@mail.ru>

	* include/gc_config_macros.h: Use old behavior for FreeBSD and
	NetBSD platform detection code (check that other GC_xxx_THREADS
	are undefined); add FIXME.

diff --git a/ChangeLog b/ChangeLog
index e1e8f4506b09baf1aa06f40cf99e044d87078c30..5e24ab3b3d6df2743271f202d10af4c68cb69dd8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-06  Ivan Maidanski <ivmai@mail.ru>
+
+       * include/gc_config_macros.h: Use old behavior for FreeBSD and
+       NetBSD platform detection code (check that other GC_xxx_THREADS
+       are undefined); add FIXME.
+
 2009-10-06  Ivan Maidanski <ivmai@mail.ru>
 
        * include/gc_config_macros.h: Rearrange the platform detection

diff --git a/include/gc_config_macros.h b/include/gc_config_macros.h
index 409f1b87baf1d705cd4eca5c1904cf7f44e4bcce..388ef435cae5bb1fa3c10ffa9c4f7051621312cf 100644 (file)
--- a/include/gc_config_macros.h
+++ b/include/gc_config_macros.h
@@ -89,15 +89,17 @@
      || defined(sun) && (defined(i386) || defined(__i386__) \
                          || defined(__amd64__))
 #   define GC_SOLARIS_THREADS
-# endif
-# if defined(__APPLE__) && defined(__MACH__)
+# elif defined(__APPLE__) && defined(__MACH__)
 #   define GC_DARWIN_THREADS
-# endif
-# if defined(__FreeBSD__) || defined(__DragonFly__)
-#   define GC_FREEBSD_THREADS
-# endif
-# if defined(__NetBSD__)
-#   define GC_NETBSD_THREADS
+# elif !defined(GC_LINUX_THREADS) && !defined(GC_HPUX_THREADS) \
+       && !defined(GC_OSF1_THREADS) && !defined(GC_IRIX_THREADS)
+    /* FIXME: Should we really need for FreeBSD and NetBSD to check     */
+    /* that no other GC_xxx_THREADS macro is set?                       */
+#   if defined(__FreeBSD__) || defined(__DragonFly__)
+#     define GC_FREEBSD_THREADS
+#   elif defined(__NetBSD__)
+#     define GC_NETBSD_THREADS
+#   endif
 # endif
 # if defined(DGUX) && (defined(i386) || defined(__i386__))
 #   define GC_DGUX386_THREADS