From 57124329882fccb5bcf10b22bb6046903d7a9a91 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Mon, 1 Feb 2021 11:19:00 +0000 Subject: [PATCH] fix some errors when using future meson build system Test Plan: compilation Reviewers: raster, Hermet Reviewed By: Hermet Differential Revision: https://phab.enlightenment.org/D12232 --- src/bin/live_edit.c | 2 +- src/bin/main.c | 8 ++++---- src/bin/menu.c | 2 +- src/include/common.h | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c index d9844b5..8dcfe2f 100644 --- a/src/bin/live_edit.c +++ b/src/bin/live_edit.c @@ -525,7 +525,7 @@ keygrabber_key_up_cb(void *data, Evas *e EINA_UNUSED, ld->ctrl_pressed = EINA_FALSE; } -Evas_Coord_Point +static Evas_Coord_Point calc_ctrl_pt_auto_align_pos(live_data *ld, int cursor_x, int cursor_y, int align_in, int *align_out) { diff --git a/src/bin/main.c b/src/bin/main.c index 61ee80c..cf167b6 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -255,7 +255,7 @@ args_dispatch(int argc, char **argv, static const Ecore_Getopt optdesc = { PACKAGE_NAME, ENVENTOR_USAGE, - VERSION, + PACKAGE_VERSION, ENVENTOR_COPYRIGHT, ENVENTOR_LICENSE, ENVENTOR_INFO, @@ -849,7 +849,7 @@ keygrabber_key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, } static void -statusbar_set() +statusbar_set(void) { Evas_Object *obj = stats_init(base_layout_get()); elm_object_part_content_set(base_layout_get(), "elm.swallow.statusbar", obj); @@ -993,7 +993,7 @@ enventor_lock_create(void) } static void -enventor_lock_remove() +enventor_lock_remove(void) { //You are not the owner of the lock. if (!own_lock) return; @@ -1155,7 +1155,7 @@ term(void) } EAPI_MAIN -int elm_main(int argc, char **argv) +static int elm_main(int argc, char **argv) { app_data ad; memset(&ad, 0x00, sizeof(ad)); diff --git a/src/bin/menu.c b/src/bin/menu.c index aaf81b6..e3907e9 100644 --- a/src/bin/menu.c +++ b/src/bin/menu.c @@ -131,7 +131,7 @@ menu_back_btn_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, menu_close(md); } -void +static void newfile_open(menu_data *md) { if (md->newfile_layout) return; diff --git a/src/include/common.h b/src/include/common.h index 50f4c1e..d5857b1 100644 --- a/src/include/common.h +++ b/src/include/common.h @@ -86,6 +86,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" #include "file_mgr.h" #include "build_setting.h" #include "preference_setting.h" +#include "text_setting.h" #include "help.h" #include "file_tab.h"