From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> To: tarantool-patches@freelists.org Cc: kostja@tarantool.org Subject: [tarantool-patches] [PATCH 1/1] Move 'info' library to src/lib Date: Tue, 26 Feb 2019 19:55:00 +0300 [thread overview] Message-ID: <181d370a0b5e747feff43fdf08a81b47ee89a3a3.1551200036.git.v.shpilevoy@tarantool.org> (raw) In-Reply-To: <cover.1551182934.git.v.shpilevoy@tarantool.org> 'Info' is a header-only library consisting of one file. It is going to be used by SWIM, stored in src/lib, but src/lib can not depend on src/. This commit moves 'info' to lib/info. Needed for #3234 --- src/box/index.cc | 2 +- src/box/lua/index.c | 2 +- src/box/lua/info.c | 2 +- src/box/lua/sql.c | 2 +- src/box/lua/stat.c | 2 +- src/box/sql.c | 2 +- src/box/vinyl.c | 2 +- src/{ => lib/info}/info.h | 0 src/lua/info.c | 2 +- 9 files changed, 8 insertions(+), 8 deletions(-) rename src/{ => lib/info}/info.h (100%) diff --git a/src/box/index.cc b/src/box/index.cc index 1dbf364a8..1bfdc6ebc 100644 --- a/src/box/index.cc +++ b/src/box/index.cc @@ -37,7 +37,7 @@ #include "iproto_constants.h" #include "txn.h" #include "rmean.h" -#include "info.h" +#include "info/info.h" /* {{{ Utilities. **********************************************/ diff --git a/src/box/lua/index.c b/src/box/lua/index.c index 6265c044a..4cf3c4d68 100644 --- a/src/box/lua/index.c +++ b/src/box/lua/index.c @@ -31,7 +31,7 @@ #include "box/lua/index.h" #include "lua/utils.h" #include "lua/info.h" -#include <info.h> +#include "info/info.h" #include "box/box.h" #include "box/index.h" #include "box/lua/tuple.h" diff --git a/src/box/lua/info.c b/src/box/lua/info.c index 70672f271..76b5646ec 100644 --- a/src/box/lua/info.c +++ b/src/box/lua/info.c @@ -41,7 +41,7 @@ #include "box/iproto.h" #include "box/wal.h" #include "box/replication.h" -#include <info.h> +#include "info/info.h" #include "box/gc.h" #include "box/engine.h" #include "box/vinyl.h" diff --git a/src/box/lua/sql.c b/src/box/lua/sql.c index e87ff7d6e..ee20faab7 100644 --- a/src/box/lua/sql.c +++ b/src/box/lua/sql.c @@ -3,7 +3,7 @@ #include "lua/msgpack.h" #include "box/sql/sqlInt.h" -#include <info.h> +#include "info/info.h" #include "lua/info.h" #include "lua/utils.h" diff --git a/src/box/lua/stat.c b/src/box/lua/stat.c index 3fce81f61..c00315cdd 100644 --- a/src/box/lua/stat.c +++ b/src/box/lua/stat.c @@ -42,7 +42,7 @@ #include "box/iproto.h" #include "box/engine.h" #include "box/vinyl.h" -#include <info.h> +#include "info/info.h" #include "lua/info.h" #include "lua/utils.h" diff --git a/src/box/sql.c b/src/box/sql.c index 580f3fa9c..a2937a089 100644 --- a/src/box/sql.c +++ b/src/box/sql.c @@ -38,7 +38,7 @@ #include "mpstream.h" #include "index.h" -#include <info.h> +#include "info/info.h" #include "schema.h" #include "box.h" #include "txn.h" diff --git a/src/box/vinyl.c b/src/box/vinyl.c index 428bae1d4..f498410c9 100644 --- a/src/box/vinyl.c +++ b/src/box/vinyl.c @@ -67,7 +67,7 @@ #include "index.h" #include "schema.h" #include "xstream.h" -#include "info.h" +#include "info/info.h" #include "column_mask.h" #include "trigger.h" #include "session.h" diff --git a/src/info.h b/src/lib/info/info.h similarity index 100% rename from src/info.h rename to src/lib/info/info.h diff --git a/src/lua/info.c b/src/lua/info.c index 5ccbc611c..71b268949 100644 --- a/src/lua/info.c +++ b/src/lua/info.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. */ #include "lua/info.h" -#include <info.h> +#include "info/info.h" #include "lua/utils.h" static void -- 2.17.2 (Apple Git-113)
next prev parent reply other threads:[~2019-02-26 16:55 UTC|newest] Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-02-26 12:11 [tarantool-patches] [PATCH v2 0/4] Move 'core' lib " Vladislav Shpilevoy 2019-02-26 12:11 ` [tarantool-patches] [PATCH v2 1/4] Remove dead dependency of http_parser on httpc Vladislav Shpilevoy 2019-02-26 12:12 ` [tarantool-patches] " Vladislav Shpilevoy 2019-02-26 12:21 ` Konstantin Osipov 2019-02-26 12:11 ` [tarantool-patches] [PATCH v2 2/4] Move 'http_parser' to src/lib Vladislav Shpilevoy 2019-02-26 12:21 ` [tarantool-patches] " Konstantin Osipov 2019-02-26 16:57 ` Vladislav Shpilevoy 2019-02-26 12:11 ` [tarantool-patches] [PATCH v2 3/4] Move 'core' and 'uuid' libs " Vladislav Shpilevoy 2019-02-26 12:22 ` [tarantool-patches] " Konstantin Osipov 2019-02-26 16:57 ` Vladislav Shpilevoy 2019-02-26 12:11 ` [tarantool-patches] [PATCH v2 4/4] Extract 'coll' library from 'core' Vladislav Shpilevoy 2019-02-26 12:23 ` [tarantool-patches] " Konstantin Osipov 2019-02-26 12:37 ` Vladislav Shpilevoy 2019-02-26 12:55 ` Konstantin Osipov 2019-02-26 13:09 ` Vladislav Shpilevoy 2019-02-26 13:17 ` Konstantin Osipov 2019-02-26 13:43 ` Vladislav Shpilevoy 2019-02-27 15:07 ` Vladislav Shpilevoy 2019-02-26 16:55 ` Vladislav Shpilevoy [this message] 2019-02-26 22:08 ` [tarantool-patches] Re: [PATCH 1/1] Move 'info' library to src/lib Konstantin Osipov 2019-02-27 15:07 ` Vladislav Shpilevoy
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=181d370a0b5e747feff43fdf08a81b47ee89a3a3.1551200036.git.v.shpilevoy@tarantool.org \ --to=v.shpilevoy@tarantool.org \ --cc=kostja@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [tarantool-patches] [PATCH 1/1] Move '\''info'\'' library to src/lib' \ /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