raster pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=878def120e38916c7eb6cfce250d4aaf4701ca56
commit 878def120e38916c7eb6cfce250d4aaf4701ca56 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Tue Dec 19 11:00:00 2017 +0900 move private.h down after system headers... to avoid conflict --- src/bin/tyalpha.c | 2 +- src/bin/tybg.c | 3 +-- src/bin/tycat.c | 3 +-- src/bin/tycommon.c | 1 - src/bin/tyls.c | 2 +- src/bin/typop.c | 2 +- src/bin/tyq.c | 2 +- 7 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/bin/tyalpha.c b/src/bin/tyalpha.c index 7facf72..63cdfaa 100644 --- a/src/bin/tyalpha.c +++ b/src/bin/tyalpha.c @@ -1,10 +1,10 @@ -#include "private.h" #include <stdio.h> #include <limits.h> #include <stdlib.h> #include <unistd.h> #include <string.h> +#include "private.h" #include "tycommon.h" static void diff --git a/src/bin/tybg.c b/src/bin/tybg.c index 0067149..53c9b02 100644 --- a/src/bin/tybg.c +++ b/src/bin/tybg.c @@ -1,10 +1,9 @@ -#include "private.h" #include <stdio.h> #include <limits.h> #include <stdlib.h> #include <unistd.h> #include <string.h> - +#include "private.h" #include "tycommon.h" static void diff --git a/src/bin/tycat.c b/src/bin/tycat.c index 988c141..aa0b38b 100644 --- a/src/bin/tycat.c +++ b/src/bin/tycat.c @@ -1,4 +1,3 @@ -#include "private.h" #include <Eina.h> #include <Ecore.h> #include <Evas.h> @@ -11,7 +10,7 @@ #include <stdlib.h> #include <unistd.h> #include <string.h> - +#include "private.h" #include "tycommon.h" enum { diff --git a/src/bin/tycommon.c b/src/bin/tycommon.c index 6b39fd5..aef8a65 100644 --- a/src/bin/tycommon.c +++ b/src/bin/tycommon.c @@ -1,6 +1,5 @@ #include "private.h" #include <stdlib.h> -#include <Eina.h> #include "tycommon.h" diff --git a/src/bin/tyls.c b/src/bin/tyls.c index 6f15813..80f21d8 100644 --- a/src/bin/tyls.c +++ b/src/bin/tyls.c @@ -1,4 +1,3 @@ -#include "private.h" #include <Eina.h> #include <Ecore.h> #include <Evas.h> @@ -12,6 +11,7 @@ #include <unistd.h> #include <string.h> #include <fnmatch.h> +#include "private.h" #include "tycommon.h" // this code sucks. just letting you know... in advance... in case you diff --git a/src/bin/typop.c b/src/bin/typop.c index 5588c31..13fe262 100644 --- a/src/bin/typop.c +++ b/src/bin/typop.c @@ -1,10 +1,10 @@ -#include "private.h" #include <stdio.h> #include <limits.h> #include <stdlib.h> #include <unistd.h> #include <string.h> +#include "private.h" #include "tycommon.h" static void diff --git a/src/bin/tyq.c b/src/bin/tyq.c index 6dd2979..1d6167f 100644 --- a/src/bin/tyq.c +++ b/src/bin/tyq.c @@ -1,10 +1,10 @@ -#include "private.h" #include <stdio.h> #include <limits.h> #include <stdlib.h> #include <unistd.h> #include <string.h> +#include "private.h" #include "tycommon.h" static void --