From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Vladislav Shpilevoy Subject: [PATCH v2 05/11] sio: turn into C Date: Wed, 5 Dec 2018 00:28:52 +0300 Message-Id: <9d72d5a49166b20a430c05e070f7f203ef944134.1543958698.git.v.shpilevoy@tarantool.org> In-Reply-To: References: In-Reply-To: References: To: tarantool-patches@freelists.org Cc: vdavydov.dev@gmail.com List-ID: Needed for #3234 --- src/CMakeLists.txt | 2 +- src/{sio.cc => sio.c} | 0 src/sio.h | 5 ++--- 3 files changed, 3 insertions(+), 4 deletions(-) rename src/{sio.cc => sio.c} (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6ce80a55e..e431d1f57 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -89,7 +89,7 @@ set (core_sources fiber_cond.c fiber_channel.c latch.c - sio.cc + sio.c evio.cc coio.cc coio_task.c diff --git a/src/sio.cc b/src/sio.c similarity index 100% rename from src/sio.cc rename to src/sio.c diff --git a/src/sio.h b/src/sio.h index 5d12f35f9..7da2787a8 100644 --- a/src/sio.h +++ b/src/sio.h @@ -96,9 +96,6 @@ sio_add_to_iov(struct iovec *iov, size_t size) iov->iov_base = (char *) iov->iov_base - size; } -#if defined(__cplusplus) -} /* extern "C" */ - const char *sio_socketname(int fd); int sio_socket(int domain, int type, int protocol); @@ -128,6 +125,8 @@ ssize_t sio_sendto(int fd, const void *buf, size_t len, int flags, ssize_t sio_recvfrom(int fd, void *buf, size_t len, int flags, struct sockaddr *src_addr, socklen_t *addrlen); +#if defined(__cplusplus) +} /* extern "C" */ #endif /* defined(__cplusplus) */ #endif /* TARANTOOL_SIO_H_INCLUDED */ -- 2.17.2 (Apple Git-113)