From 698dc8b6f513f1cb06d23a64da8218fa31941c61 Mon Sep 17 00:00:00 2001 From: ivmai Date: Tue, 6 Oct 2009 16:16:01 +0000 Subject: [PATCH] 2009-10-06 Ivan Maidanski * 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. --- ChangeLog | 6 ++++++ include/gc_config_macros.h | 18 ++++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index e1e8f450..5e24ab3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-10-06 Ivan Maidanski + + * 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 * include/gc_config_macros.h: Rearrange the platform detection diff --git a/include/gc_config_macros.h b/include/gc_config_macros.h index 409f1b87..388ef435 100644 --- 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 -- 2.49.0