|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r85768 - in trunk/boost/asio/detail: . impl
From: chris_at_[hidden]
Date: 2013-09-17 18:53:17
Author: chris_kohlhoff
Date: 2013-09-17 18:53:17 EDT (Tue, 17 Sep 2013)
New Revision: 85768
URL: http://svn.boost.org/trac/boost/changeset/85768
Log:
Fix prefix on extern "C" function name.
Text files modified:
trunk/boost/asio/detail/impl/signal_set_service.ipp | 8 ++++----
trunk/boost/asio/detail/signal_set_service.hpp | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
Modified: trunk/boost/asio/detail/impl/signal_set_service.ipp
==============================================================================
--- trunk/boost/asio/detail/impl/signal_set_service.ipp Tue Sep 17 18:42:50 2013 (r85767)
+++ trunk/boost/asio/detail/impl/signal_set_service.ipp 2013-09-17 18:53:17 EDT (Tue, 17 Sep 2013) (r85768)
@@ -57,7 +57,7 @@
return &state;
}
-void asio_signal_handler(int signal_number)
+void boost_asio_signal_handler(int signal_number)
{
#if defined(BOOST_ASIO_WINDOWS) \
|| defined(BOOST_ASIO_WINDOWS_RUNTIME) \
@@ -77,7 +77,7 @@
// || defined(__CYGWIN__)
#if defined(BOOST_ASIO_HAS_SIGNAL) && !defined(BOOST_ASIO_HAS_SIGACTION)
- ::signal(signal_number, asio_signal_handler);
+ ::signal(signal_number, boost_asio_signal_handler);
#endif // defined(BOOST_ASIO_HAS_SIGNAL) && !defined(BOOST_ASIO_HAS_SIGACTION)
}
@@ -274,11 +274,11 @@
using namespace std; // For memset.
struct sigaction sa;
memset(&sa, 0, sizeof(sa));
- sa.sa_handler = asio_signal_handler;
+ sa.sa_handler = boost_asio_signal_handler;
sigfillset(&sa.sa_mask);
if (::sigaction(signal_number, &sa, 0) == -1)
# else // defined(BOOST_ASIO_HAS_SIGACTION)
- if (::signal(signal_number, asio_signal_handler) == SIG_ERR)
+ if (::signal(signal_number, boost_asio_signal_handler) == SIG_ERR)
# endif // defined(BOOST_ASIO_HAS_SIGACTION)
{
# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
Modified: trunk/boost/asio/detail/signal_set_service.hpp
==============================================================================
--- trunk/boost/asio/detail/signal_set_service.hpp Tue Sep 17 18:42:50 2013 (r85767)
+++ trunk/boost/asio/detail/signal_set_service.hpp 2013-09-17 18:53:17 EDT (Tue, 17 Sep 2013) (r85768)
@@ -46,7 +46,7 @@
extern BOOST_ASIO_DECL struct signal_state* get_signal_state();
-extern "C" BOOST_ASIO_DECL void asio_signal_handler(int signal_number);
+extern "C" BOOST_ASIO_DECL void boost_asio_signal_handler(int signal_number);
class signal_set_service
{
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk