feedc0de/boost_system
1
0
Fork 0
forked from boostorg/system
Code Pull Requests Activity

Revert portion of 68183. This changeset was aimed at other libraries, but inadvertently modified three boost/system headers.

Browse Source 
[SVN r78325]
This commit is contained in:
Beman Dawes
2012-05-04 20:12:58 +00:00
parent 5183a336c2
commit bdcfe61429
3 changed files with 15 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/system/api_config.hpp
+7 -14
View File
@@ -21,29 +21,22 @@
//--------------------------------------------------------------------------------------//
#ifndef BOOST_SYSTEM_API_CONFIG_HPP
#ifndef BOOST_SYSTEM_API_CONFIG_HPP
#define BOOST_SYSTEM_API_CONFIG_HPP
# if defined(BOOST_SYSTEM_POSIX_API) || defined(BOOST_SYSTEM_WINDOWS_API)
# error user defined BOOST_SYSTEM_POSIX_API or BOOST_SYSTEM_WINDOWS_API not supported
# if defined(BOOST_POSIX_API) || defined(BOOST_WINDOWS_API)
# error user defined BOOST_POSIX_API or BOOST_WINDOWS_API not supported
# endif
// BOOST_SYSTEM_POSIX_API or BOOST_SYSTEM_WINDOWS_API specify which API to use
// BOOST_POSIX_API or BOOST_WINDOWS_API specify which API to use
// Cygwin/MinGW does not predefine _WIN32.
// Standalone MinGW and all other known Windows compilers do predefine _WIN32
// Compilers that predefine _WIN32 or __MINGW32__ do so for Windows 64-bit builds too.
# if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32) )
# define BOOST_SYSTEM_WINDOWS_API
# else
# define BOOST_SYSTEM_POSIX_API
# endif
//# if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__CYGWIN__))
# if defined(_WIN32) || defined(__CYGWIN__) // Windows default, including MinGW and Cygwin
# define BOOST_WINDOWS_API
# else
# define BOOST_POSIX_API
# define BOOST_POSIX_API
# endif
#endif // BOOST_SYSTEM_API_CONFIG_HPP
#endif // BOOST_SYSTEM_API_CONFIG_HPP