summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLauro Moura <lauromoura@expertisesolutions.com.br>2018-03-06 17:42:00 -0800
committerCedric Bail <cedric@osg.samsung.com>2018-03-06 19:05:57 -0800
commitd78620e00191c5268d6ab2271db7949228d06e0f (patch)
treef17567e2f49ed33ea80449f9388b183b7976ab64
parent59c0246eeafa0e1bbce4a61eea3687d77b105ce6 (diff)
elm: fix location of legacy include for elm_code.
Summary: Instead of including the legacy header on the main header, just include it where it is actually used (diff_widget.c), like in elm_code_widget.c. Test Plan: Try to compile edi with the tarball from `make dist`. It should not fail with elm_code related errors. Reviewers: raster, stefan_schmidt, felipealmeida Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D5807 Signed-off-by: Cedric Bail <cedric@osg.samsung.com>
-rw-r--r--src/Makefile_Elementary.am1
-rw-r--r--src/lib/elementary/elm_code.h1
-rw-r--r--src/lib/elementary/elm_code_diff_widget.c1
3 files changed, 1 insertions, 2 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 96fd075..d480231 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -381,7 +381,6 @@ includesunstable_HEADERS = \
381 lib/elementary/elm_code.h \ 381 lib/elementary/elm_code.h \
382 lib/elementary/elm_code_widget_legacy.h \ 382 lib/elementary/elm_code_widget_legacy.h \
383 lib/elementary/elm_code_widget_selection.h \ 383 lib/elementary/elm_code_widget_selection.h \
384 lib/elementary/elm_code_widget_legacy.eo.h \
385 lib/elementary/elm_code_diff_widget.h \ 384 lib/elementary/elm_code_diff_widget.h \
386 lib/elementary/elm_code_common.h \ 385 lib/elementary/elm_code_common.h \
387 lib/elementary/elm_code_line.h \ 386 lib/elementary/elm_code_line.h \
diff --git a/src/lib/elementary/elm_code.h b/src/lib/elementary/elm_code.h
index 3a0887b..9ffd0e9 100644
--- a/src/lib/elementary/elm_code.h
+++ b/src/lib/elementary/elm_code.h
@@ -11,7 +11,6 @@
11#include "elm_code_parse.h" 11#include "elm_code_parse.h"
12#include "elm_code_syntax.h" 12#include "elm_code_syntax.h"
13#include "elm_code_widget.eo.h" 13#include "elm_code_widget.eo.h"
14#include "elm_code_widget_legacy.eo.h"
15#include "elm_code_widget_legacy.h" 14#include "elm_code_widget_legacy.h"
16#include "elm_code_widget_selection.h" 15#include "elm_code_widget_selection.h"
17#include "elm_code_diff_widget.h" 16#include "elm_code_diff_widget.h"
diff --git a/src/lib/elementary/elm_code_diff_widget.c b/src/lib/elementary/elm_code_diff_widget.c
index d8ec149..593f044 100644
--- a/src/lib/elementary/elm_code_diff_widget.c
+++ b/src/lib/elementary/elm_code_diff_widget.c
@@ -5,6 +5,7 @@
5#include "Elementary.h" 5#include "Elementary.h"
6 6
7#include "elm_code_private.h" 7#include "elm_code_private.h"
8#include "elm_code_widget_legacy.eo.h"
8 9
9#define _ELM_CODE_DIFF_WIDGET_LEFT "diffwidgetleft" 10#define _ELM_CODE_DIFF_WIDGET_LEFT "diffwidgetleft"
10#define _ELM_CODE_DIFF_WIDGET_RIGHT "diffwidgetright" 11#define _ELM_CODE_DIFF_WIDGET_RIGHT "diffwidgetright"