From 3ddbda1266c3902500c543692884e5d434ac7e0b Mon Sep 17 00:00:00 2001
From: Vincent Torri <vincent.torri@gmail.com>
Date: Mon, 24 Jun 2019 09:01:25 -0400
Subject: [PATCH] remove last bits of Evil.h in tests and use evil_private.h
 instead

Test Plan: compilation

Reviewers: zmike, raster, cedric

Reviewed By: zmike

Subscribers: #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D9154
---
 src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c | 4 ----
 src/tests/eina/eina_test_error.c                        | 2 +-
 src/tests/eolian/eolian_generation.c                    | 4 ----
 src/tests/eolian/eolian_suite.c                         | 2 +-
 src/tests/evil/evil_suite.c                             | 3 ++-
 src/tests/evil/evil_test_dlfcn.c                        | 2 +-
 src/tests/evil/evil_test_main.c                         | 2 +-
 src/tests/evil/evil_test_stdio.c                        | 2 +-
 src/tests/evil/evil_test_stdlib.c                       | 2 +-
 src/tests/evil/evil_test_unistd.c                       | 2 +-
 10 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c b/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
index cf83eaf402..dda74b4c04 100644
--- a/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
+++ b/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
@@ -19,10 +19,6 @@
 # include <arpa/inet.h>
 #endif
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include <ctype.h>
 
 #include "ecore_con_suite.h"
diff --git a/src/tests/eina/eina_test_error.c b/src/tests/eina/eina_test_error.c
index 572c6b02b7..7c6d25b3c4 100644
--- a/src/tests/eina/eina_test_error.c
+++ b/src/tests/eina/eina_test_error.c
@@ -25,7 +25,7 @@
 #include <string.h>
 
 #ifdef _WIN32
-# include <Evil.h>
+# include <evil_private.h> /* setenv */
 #endif
 
 #include <Eina.h>
diff --git a/src/tests/eolian/eolian_generation.c b/src/tests/eolian/eolian_generation.c
index 99e0f69a4b..f60bb875bf 100644
--- a/src/tests/eolian/eolian_generation.c
+++ b/src/tests/eolian/eolian_generation.c
@@ -5,10 +5,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#ifdef _WIN32
-#include "Evil.h"
-#endif
-
 #include <Eina.h>
 #include <Eolian.h>
 
diff --git a/src/tests/eolian/eolian_suite.c b/src/tests/eolian/eolian_suite.c
index 3229be33ce..22b5dfa75b 100644
--- a/src/tests/eolian/eolian_suite.c
+++ b/src/tests/eolian/eolian_suite.c
@@ -3,7 +3,7 @@
 #endif
 
 #ifdef _WIN32
-# include <Evil.h> /* setenv */
+# include <evil_private.h> /* setenv */
 #endif
 
 #include "eolian_suite.h"
diff --git a/src/tests/evil/evil_suite.c b/src/tests/evil/evil_suite.c
index b29dbc702b..70fd516911 100644
--- a/src/tests/evil/evil_suite.c
+++ b/src/tests/evil/evil_suite.c
@@ -23,9 +23,10 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <windows.h> /* putenv */
+
 #include "evil_suite.h"
 #include "../efl_check.h"
-#include <Evil.h>
 
 static const Efl_Test_Case etc[] = {
    { "Dlfcn", evil_test_dlfcn },
diff --git a/src/tests/evil/evil_test_dlfcn.c b/src/tests/evil/evil_test_dlfcn.c
index d932e710a8..56b4eaffb9 100644
--- a/src/tests/evil/evil_test_dlfcn.c
+++ b/src/tests/evil/evil_test_dlfcn.c
@@ -20,7 +20,7 @@
 # include "config.h"
 #endif
 
-#include <Evil.h>
+#include <evil_private.h>
 
 #include "evil_suite.h"
 
diff --git a/src/tests/evil/evil_test_main.c b/src/tests/evil/evil_test_main.c
index bae448219f..57b296632c 100644
--- a/src/tests/evil/evil_test_main.c
+++ b/src/tests/evil/evil_test_main.c
@@ -20,7 +20,7 @@
 # include "config.h"
 #endif
 
-#include <Evil.h>
+#include <evil_private.h>
 
 #include "evil_suite.h"
 
diff --git a/src/tests/evil/evil_test_stdio.c b/src/tests/evil/evil_test_stdio.c
index 6b39059e9c..563876a82a 100644
--- a/src/tests/evil/evil_test_stdio.c
+++ b/src/tests/evil/evil_test_stdio.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <direct.h>
 
-#include <Evil.h>
+#include <evil_private.h>
 
 #include "evil_suite.h"
 
diff --git a/src/tests/evil/evil_test_stdlib.c b/src/tests/evil/evil_test_stdlib.c
index a39515ccb4..c9f09813ef 100644
--- a/src/tests/evil/evil_test_stdlib.c
+++ b/src/tests/evil/evil_test_stdlib.c
@@ -22,7 +22,7 @@
 
 #include <stdlib.h>
 
-#include <Evil.h>
+#include <evil_private.h>
 
 #include "evil_suite.h"
 
diff --git a/src/tests/evil/evil_test_unistd.c b/src/tests/evil/evil_test_unistd.c
index 5252d49775..c5f56d0fc0 100644
--- a/src/tests/evil/evil_test_unistd.c
+++ b/src/tests/evil/evil_test_unistd.c
@@ -27,7 +27,7 @@
 # include <winsock2.h>
 # undef WIN32_LEAN_AND_MEAN
 
-#include <Evil.h>
+#include <evil_private.h>
 
 #include "evil_suite.h"