More fixes resulting from the new config

[SVN r11182]
This commit is contained in:
John Maddock
2001-09-21 11:35:54 +00:00
parent 45cb855a1c
commit fed782c163
4 changed files with 17 additions and 3 deletions

View File

@@ -11,7 +11,7 @@
#if (__COMO_VERSION__ <= 4245) || !defined(BOOST_STRICT_CONFIG) #if (__COMO_VERSION__ <= 4245) || !defined(BOOST_STRICT_CONFIG)
# define BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS # define BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
# if defined(_MSC_VER) && _MSC_VER <= 1200 # if defined(_MSC_VER) && _MSC_VER <= 1300
# define BOOST_NO_STDC_NAMESPACE # define BOOST_NO_STDC_NAMESPACE
# define BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP # define BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
# define BOOST_NO_SWPRINTF # define BOOST_NO_SWPRINTF

View File

@@ -24,7 +24,13 @@
# define BOOST_NO_SWPRINTF # define BOOST_NO_SWPRINTF
#endif #endif
#define BOOST_HAS_WINTHREADS //
// Win32 will normally be using native Win32 threads,
// but there is a pthread library avaliable as an option:
//
#ifndef BOOST_HAS_PTHREADS
# define BOOST_HAS_WINTHREADS
#endif
// WEK: Added // WEK: Added
#define BOOST_HAS_FTIME #define BOOST_HAS_FTIME

View File

@@ -26,7 +26,7 @@
// Strictly speaking this may catch platforms with a // Strictly speaking this may catch platforms with a
// non-functioning stub <pthreads.h>, but such occurrences should // non-functioning stub <pthreads.h>, but such occurrences should
// occur very rarely if at all. // occur very rarely if at all.
# if defined(_POSIX_THREADS) && (_POSIX_THREADS+0 >= 0) # if defined(_POSIX_THREADS) && (_POSIX_THREADS+0 >= 0) && !defined(BOOST_HAS_WINTHREADS)
# define BOOST_HAS_PTHREADS # define BOOST_HAS_PTHREADS
# endif # endif

View File

@@ -146,6 +146,14 @@
# undef BOOST_HAS_THREADS # undef BOOST_HAS_THREADS
#endif #endif
//
// Turn threading support off if we don't recognise the threading API:
//
#if defined(BOOST_HAS_THREADS) && !defined(BOOST_HAS_PTHREADS)\
&& !defined(BOOST_HAS_WINTHREADS) && !defined(BOOST_HAS_BETHREADS)
# undef BOOST_HAS_THREADS
#endif
// //
// If the compiler claims to be C99 conformant, then it had better // If the compiler claims to be C99 conformant, then it had better
// have a <stdint.h>: // have a <stdint.h>: