The gc library does not remember its settings: we have to define GC_PTHREADS or GC_WIN32_THREADS before including the gc.h header.

This commit is contained in:
Juan Jose Garcia Ripoll 2009-10-01 12:01:26 +02:00
parent 5618cc648b
commit 5ae1c96929
2 changed files with 17 additions and 11 deletions

View file

@ -48,13 +48,6 @@
/* Always use CLOS */
#define CLOS
/* Use Boehm's garbage collector */
#undef GBC_BOEHM
#ifdef GBC_BOEHM
#define ECL_DYNAMIC_VV
#include "@ECL_BOEHM_GC_HEADER@"
#endif
/* Use GNU Multiple Precision library for bignums */
#ifndef DPP
#undef WITH_GMP
@ -66,7 +59,9 @@
/* Userland threads? */
#undef ECL_THREADS
#ifdef ECL_THREADS
# define GC_THREADS
# if defined(_MSC_VER) || defined(mingw32)
# define ECL_WINDOWS_THREADS
# endif
/* # udef ECL_SEMAPHORES */
#endif
@ -75,6 +70,20 @@
#undef WITH___THREAD
#endif
/* Use Boehm's garbage collector */
#undef GBC_BOEHM
#ifdef GBC_BOEHM
# ifdef ECL_WINDOWS_THREADS
# define GC_WIN32_THREADS
# else
# ifdef ECL_THREADS
# define GC_PTHREADS
# endif
# endif
# define ECL_DYNAMIC_VV
# include "@ECL_BOEHM_GC_HEADER@"
#endif
/* Network streams */
#undef TCP
#if defined(TCP) && (defined(_MSC_VER) || defined(mingw32))

View file

@ -824,9 +824,6 @@ struct ecl_dummy {
};
#ifdef ECL_THREADS
#if defined(_MSC_VER) || defined(mingw32)
# define ECL_WINDOWS_THREADS
#endif
struct ecl_process {
HEADER1(active);
cl_object name;