From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 8EECD27C25 for ; Tue, 26 Feb 2019 11:55:03 -0500 (EST) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wlealhhr0FCy for ; Tue, 26 Feb 2019 11:55:03 -0500 (EST) Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 2B381262E0 for ; Tue, 26 Feb 2019 11:55:03 -0500 (EST) From: Vladislav Shpilevoy Subject: [tarantool-patches] [PATCH 1/1] Move 'info' library to src/lib Date: Tue, 26 Feb 2019 19:55:00 +0300 Message-Id: <181d370a0b5e747feff43fdf08a81b47ee89a3a3.1551200036.git.v.shpilevoy@tarantool.org> In-Reply-To: References: Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-subscribe: List-owner: List-post: List-archive: To: tarantool-patches@freelists.org Cc: kostja@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 +#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 +#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 +#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 +#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 +#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 +#include "info/info.h" #include "lua/utils.h" static void -- 2.17.2 (Apple Git-113)