From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> To: tarantool-patches@freelists.org Cc: vdavydov.dev@gmail.com Subject: [PATCH v2 05/11] sio: turn into C Date: Wed, 5 Dec 2018 00:28:52 +0300 [thread overview] Message-ID: <9d72d5a49166b20a430c05e070f7f203ef944134.1543958698.git.v.shpilevoy@tarantool.org> (raw) In-Reply-To: <cover.1543958698.git.v.shpilevoy@tarantool.org> In-Reply-To: <cover.1543958698.git.v.shpilevoy@tarantool.org> 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)
next prev parent reply other threads:[~2018-12-04 21:28 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-12-04 21:28 [PATCH v2 00/11] SWIM preparation Vladislav Shpilevoy 2018-12-04 21:28 ` [PATCH v2 01/11] sio: remove unused functions Vladislav Shpilevoy 2018-12-09 12:10 ` Vladimir Davydov 2018-12-04 21:28 ` [PATCH v2 10/11] evio: make code C compatible Vladislav Shpilevoy 2018-12-05 8:56 ` Vladimir Davydov 2018-12-05 20:07 ` [tarantool-patches] " Vladislav Shpilevoy 2018-12-04 21:28 ` [PATCH v2 11/11] evio: turn nto c Vladislav Shpilevoy 2018-12-04 21:28 ` [PATCH v2 02/11] sio: treat EADDRINUSE in sio_listen as error Vladislav Shpilevoy 2018-12-09 12:57 ` Vladimir Davydov 2018-12-10 15:36 ` [tarantool-patches] " Vladislav Shpilevoy 2018-12-04 21:28 ` [PATCH v2 03/11] sio: remove exceptions Vladislav Shpilevoy 2018-12-09 12:54 ` Vladimir Davydov 2018-12-10 15:37 ` [tarantool-patches] " Vladislav Shpilevoy 2018-12-11 8:44 ` Vladimir Davydov 2018-12-04 21:28 ` [PATCH v2 04/11] sio: make code compatible with C Vladislav Shpilevoy 2018-12-05 8:57 ` Vladimir Davydov 2018-12-05 20:07 ` [tarantool-patches] " Vladislav Shpilevoy 2018-12-04 21:28 ` Vladislav Shpilevoy [this message] 2018-12-04 21:28 ` [PATCH v2 06/11] evio: make on_accept be nothrow Vladislav Shpilevoy 2018-12-04 21:28 ` [PATCH v2 07/11] coio: fix double close of a file descriptor Vladislav Shpilevoy 2018-12-04 21:28 ` [PATCH v2 08/11] evio: remove exceptions Vladislav Shpilevoy 2018-12-04 21:28 ` [PATCH v2 09/11] coio: fix file descriptor leak on accept Vladislav Shpilevoy 2018-12-11 8:47 ` [PATCH v2 00/11] SWIM preparation Vladimir Davydov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=9d72d5a49166b20a430c05e070f7f203ef944134.1543958698.git.v.shpilevoy@tarantool.org \ --to=v.shpilevoy@tarantool.org \ --cc=tarantool-patches@freelists.org \ --cc=vdavydov.dev@gmail.com \ --subject='Re: [PATCH v2 05/11] sio: turn into C' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox