boostorg/system
1
0
Fork 1
mirror of https://github.com/boostorg/system.git synced 2025-07-30 04:27:14 +02:00
Code Issues Packages Projects Releases Wiki 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

13
include/boost/system/api_config.hpp
View File

@ -24,22 +24,15 @@
#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

16
include/boost/system/config.hpp
View File

@ -11,19 +11,7 @@
#define BOOST_SYSTEM_CONFIG_HPP
#include <boost/config.hpp>
#if defined(BOOST_SYSTEM_SOURCE) && !defined(BOOST_USE_WINDOWS_H)
#define BOOST_USE_WINDOWS_H
#endif
#include <boost/system/api_config.hpp> // for BOOST_SYSTEM_POSIX_API or BOOST_SYSTEM_WINDOWS_API
#ifdef BOOST_SYSTEM_INLINED
#define BOOST_SYSTEM_INLINE inline
#define BOOST_SYSTEM_DECL
#else
#define BOOST_SYSTEM_INLINE
#include <boost/system/api_config.hpp> // for BOOST_POSIX_API or BOOST_WINDOWS_API
// This header implements separate compilation features as described in
// http://www.boost.org/more/separate_compilation.html
@ -77,7 +65,5 @@
#include <boost/config/auto_link.hpp>
#endif // auto-linking disabled
#endif // BOOST_SYSTEM_INLINED
#endif // BOOST_SYSTEM_CONFIG_HPP

6
include/boost/system/cygwin_error.hpp
View File

@ -7,8 +7,8 @@
// See library home page at http://www.boost.org/libs/system
#ifndef BOOST_SYSTEM_CYGWIN_ERROR_HPP
#define BOOST_SYSTEM_CYGWIN_ERROR_HPP
#ifndef BOOST_CYGWIN_ERROR_HPP
#define BOOST_CYGWIN_ERROR_HPP
// This header is effectively empty for compiles on operating systems where
// it is not applicable.
@ -53,4 +53,4 @@ namespace boost
#endif // __CYGWIN__
#endif // BOOST_SYSTEM_CYGWIN_ERROR_HPP
#endif // BOOST_CYGWIN_ERROR_HPP