summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2019-07-28 09:27:27 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-07-28 09:27:27 +0100
commita6ade14c5e65ab729b1013388ec1aea4be22afc7 (patch)
treeb290aa6c715f3a2a10dc8b067d8ab3781e840d21
parent04848c98f217b3fa1fc2a49bce2649895e705611 (diff)
Evil: remove pwd code in Evil and fix compilation failures after the removal
Summary: remove pwd code in Evil Test Plan: compilation Reviewers: zmike, cedric, raster Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D9420
-rw-r--r--src/benchmarks/elementary/focus_widget_tree.c4
-rw-r--r--src/bin/elementary/test.c5
-rw-r--r--src/bin/elementary/test_combobox.c5
-rw-r--r--src/bin/elementary/test_fileselector.c4
-rw-r--r--src/bin/elementary/test_fileselector_button.c4
-rw-r--r--src/bin/elementary/test_fileselector_entry.c4
-rw-r--r--src/bin/elementary/test_genlist.c5
-rw-r--r--src/bin/elementary/test_label.c5
-rw-r--r--src/bin/elementary/test_panel.c5
-rw-r--r--src/lib/ecore_con/ecore_con_local.c6
-rw-r--r--src/lib/efreet/efreet_base.c3
-rw-r--r--src/lib/eina/eina_vpath.c6
-rw-r--r--src/lib/eina/eina_vpath_xdg.c4
-rw-r--r--src/lib/elementary/Efl_Ui.h4
-rw-r--r--src/lib/elementary/Elementary.h4
-rw-r--r--src/lib/elementary/efl_datetime_manager.c4
-rw-r--r--src/lib/elementary/efl_ui_clock.c4
-rw-r--r--src/lib/elementary/elm_config.c1
-rw-r--r--src/lib/elementary/elm_main.c1
-rw-r--r--src/lib/elementary/elm_prefs.c4
-rw-r--r--src/lib/elementary/elm_util.c4
-rw-r--r--src/lib/ethumb/ethumb.c4
-rw-r--r--src/lib/evil/Evil.h6
-rw-r--r--src/lib/evil/evil_pwd.c69
-rw-r--r--src/lib/evil/meson.build2
-rw-r--r--src/lib/evil/pwd.h89
-rw-r--r--src/tests/eina/eina_test_vpath.c4
-rw-r--r--src/tests/elementary/spec/efl_test_format.c4
28 files changed, 89 insertions, 175 deletions
diff --git a/src/benchmarks/elementary/focus_widget_tree.c b/src/benchmarks/elementary/focus_widget_tree.c
index 5f05df3445..d5e1531bb5 100644
--- a/src/benchmarks/elementary/focus_widget_tree.c
+++ b/src/benchmarks/elementary/focus_widget_tree.c
@@ -2,6 +2,10 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#ifdef _WIN32
6# include <evil_private.h> /* setenv */
7#endif
8
5#include <Elementary.h> 9#include <Elementary.h>
6#include <Ecore_Input_Evas.h> 10#include <Ecore_Input_Evas.h>
7#include "elm_widget.h" 11#include "elm_widget.h"
diff --git a/src/bin/elementary/test.c b/src/bin/elementary/test.c
index 79d56af40e..4a77460058 100644
--- a/src/bin/elementary/test.c
+++ b/src/bin/elementary/test.c
@@ -3,6 +3,11 @@
3#endif 3#endif
4 4
5#include <string.h> 5#include <string.h>
6
7#ifdef _WIN32
8# include <evil_private.h> /* strcasestr */
9#endif
10
6#include <Efl_Ui.h> 11#include <Efl_Ui.h>
7#include <Elementary.h> 12#include <Elementary.h>
8#include "test.h" 13#include "test.h"
diff --git a/src/bin/elementary/test_combobox.c b/src/bin/elementary/test_combobox.c
index c71cf2f1e0..ee68a3bdaf 100644
--- a/src/bin/elementary/test_combobox.c
+++ b/src/bin/elementary/test_combobox.c
@@ -2,6 +2,11 @@
2#ifdef HAVE_CONFIG_H 2#ifdef HAVE_CONFIG_H
3# include "elementary_config.h" 3# include "elementary_config.h"
4#endif 4#endif
5
6#ifdef _WIN32
7# include <evil_private.h> /* strcasestr */
8#endif
9
5#include <Elementary.h> 10#include <Elementary.h>
6 11
7static void 12static void
diff --git a/src/bin/elementary/test_fileselector.c b/src/bin/elementary/test_fileselector.c
index 1c23066097..880162e9d2 100644
--- a/src/bin/elementary/test_fileselector.c
+++ b/src/bin/elementary/test_fileselector.c
@@ -2,6 +2,10 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#ifdef _WIN32
6# include <evil_private.h> /* mkdir stelocale */
7#endif
8
5#include <Elementary.h> 9#include <Elementary.h>
6#ifndef ENABLE_NLS 10#ifndef ENABLE_NLS
7# ifndef setlocale 11# ifndef setlocale
diff --git a/src/bin/elementary/test_fileselector_button.c b/src/bin/elementary/test_fileselector_button.c
index b04e9d38ef..2ee1a3338c 100644
--- a/src/bin/elementary/test_fileselector_button.c
+++ b/src/bin/elementary/test_fileselector_button.c
@@ -3,6 +3,10 @@
3# include "elementary_config.h" 3# include "elementary_config.h"
4#endif 4#endif
5 5
6#ifdef _WIN32
7# include <evil_private.h> /* mkdir */
8#endif
9
6#include <Elementary.h> 10#include <Elementary.h>
7 11
8struct _api_data 12struct _api_data
diff --git a/src/bin/elementary/test_fileselector_entry.c b/src/bin/elementary/test_fileselector_entry.c
index 3bfd438204..17d6ddee4b 100644
--- a/src/bin/elementary/test_fileselector_entry.c
+++ b/src/bin/elementary/test_fileselector_entry.c
@@ -3,6 +3,10 @@
3# include "elementary_config.h" 3# include "elementary_config.h"
4#endif 4#endif
5 5
6#ifdef _WIN32
7# include <evil_private.h> /* mkdir */
8#endif
9
6#include <Elementary.h> 10#include <Elementary.h>
7 11
8struct _api_data 12struct _api_data
diff --git a/src/bin/elementary/test_genlist.c b/src/bin/elementary/test_genlist.c
index b4168fd830..c3f4d95943 100644
--- a/src/bin/elementary/test_genlist.c
+++ b/src/bin/elementary/test_genlist.c
@@ -3,6 +3,11 @@
3#ifdef HAVE_CONFIG_H 3#ifdef HAVE_CONFIG_H
4#include "elementary_config.h" 4#include "elementary_config.h"
5#endif 5#endif
6
7#ifdef _WIN32
8# include <evil_private.h> /* strcasestr */
9#endif
10
6#include <Elementary.h> 11#include <Elementary.h>
7 12
8#include "test_explode.h" 13#include "test_explode.h"
diff --git a/src/bin/elementary/test_label.c b/src/bin/elementary/test_label.c
index 2b11ff5b2a..c00ae7986e 100644
--- a/src/bin/elementary/test_label.c
+++ b/src/bin/elementary/test_label.c
@@ -1,6 +1,11 @@
1#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4
5#ifdef _WIN32
6# include <evil_private.h> /* strcasestr */
7#endif
8
4#include <Elementary.h> 9#include <Elementary.h>
5 10
6enum _slide_style 11enum _slide_style
diff --git a/src/bin/elementary/test_panel.c b/src/bin/elementary/test_panel.c
index 371e6d5541..a6318d1c29 100644
--- a/src/bin/elementary/test_panel.c
+++ b/src/bin/elementary/test_panel.c
@@ -1,6 +1,11 @@
1#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4
5#ifdef _WIN32
6# include <evil_private.h> /* mkdir */
7#endif
8
4#include <Elementary.h> 9#include <Elementary.h>
5 10
6#define LIST_ITEM_MAX 20 11#define LIST_ITEM_MAX 20
diff --git a/src/lib/ecore_con/ecore_con_local.c b/src/lib/ecore_con/ecore_con_local.c
index 5fed0b711e..fae182e133 100644
--- a/src/lib/ecore_con/ecore_con_local.c
+++ b/src/lib/ecore_con/ecore_con_local.c
@@ -10,7 +10,11 @@
10#include <fcntl.h> 10#include <fcntl.h>
11#include <sys/types.h> 11#include <sys/types.h>
12#include <sys/stat.h> 12#include <sys/stat.h>
13#include <pwd.h> 13#ifdef _WIN32
14# include <evil_private.h> /* mkdir */
15#else
16# include <pwd.h>
17#endif
14#include <libgen.h> 18#include <libgen.h>
15 19
16#ifdef HAVE_SYSTEMD 20#ifdef HAVE_SYSTEMD
diff --git a/src/lib/efreet/efreet_base.c b/src/lib/efreet/efreet_base.c
index e7bc54f118..6497e8d955 100644
--- a/src/lib/efreet/efreet_base.c
+++ b/src/lib/efreet/efreet_base.c
@@ -8,10 +8,11 @@
8#include <unistd.h> 8#include <unistd.h>
9#include <ctype.h> 9#include <ctype.h>
10#include <sys/types.h> 10#include <sys/types.h>
11#include <pwd.h>
12 11
13#ifdef _WIN32 12#ifdef _WIN32
14# include <winsock2.h> 13# include <winsock2.h>
14#else
15# include <pwd.h>
15#endif 16#endif
16 17
17#include <Ecore_File.h> 18#include <Ecore_File.h>
diff --git a/src/lib/eina/eina_vpath.c b/src/lib/eina/eina_vpath.c
index c06ee5abe8..78ae6a250d 100644
--- a/src/lib/eina/eina_vpath.c
+++ b/src/lib/eina/eina_vpath.c
@@ -3,7 +3,11 @@
3#endif 3#endif
4 4
5#include <sys/types.h> 5#include <sys/types.h>
6#include <pwd.h> 6#ifdef _WIN32
7# include <evil_private.h> /* mkdir */
8#else
9# include <pwd.h>
10#endif
7 11
8#include <Eina.h> 12#include <Eina.h>
9 13
diff --git a/src/lib/eina/eina_vpath_xdg.c b/src/lib/eina/eina_vpath_xdg.c
index 0db6e7836d..43ca85e1d9 100644
--- a/src/lib/eina/eina_vpath_xdg.c
+++ b/src/lib/eina/eina_vpath_xdg.c
@@ -3,7 +3,9 @@
3#endif 3#endif
4 4
5#include <sys/types.h> 5#include <sys/types.h>
6#include <pwd.h> 6#ifndef _WIN32
7# include <pwd.h>
8#endif
7 9
8#include <Eina.h> 10#include <Eina.h>
9 11
diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index 93d3a0a1fa..e390b89efe 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -21,7 +21,9 @@
21#ifdef ELM_DIRENT_H 21#ifdef ELM_DIRENT_H
22#include <dirent.h> 22#include <dirent.h>
23#endif 23#endif
24#include <pwd.h> 24#ifndef _WIN32
25# include <pwd.h>
26#endif
25#include <errno.h> 27#include <errno.h>
26 28
27#ifdef ELM_UNIX 29#ifdef ELM_UNIX
diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h
index 6faf7f7ac5..bdc128a2b8 100644
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -27,7 +27,9 @@
27#ifdef ELM_DIRENT_H 27#ifdef ELM_DIRENT_H
28#include <dirent.h> 28#include <dirent.h>
29#endif 29#endif
30#include <pwd.h> 30#ifndef _WIN32
31# include <pwd.h>
32#endif
31#include <errno.h> 33#include <errno.h>
32 34
33#ifdef ELM_UNIX 35#ifdef ELM_UNIX
diff --git a/src/lib/elementary/efl_datetime_manager.c b/src/lib/elementary/efl_datetime_manager.c
index 8739be8251..24daa34217 100644
--- a/src/lib/elementary/efl_datetime_manager.c
+++ b/src/lib/elementary/efl_datetime_manager.c
@@ -5,6 +5,10 @@
5# include <langinfo.h> 5# include <langinfo.h>
6#endif 6#endif
7 7
8#ifdef _WIN32
9# include <evil_private.h> /* nl_langinfo */
10#endif
11
8#include <Elementary.h> 12#include <Elementary.h>
9#include "elm_priv.h" 13#include "elm_priv.h"
10 14
diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c
index e580d3cf06..5a86dcdc26 100644
--- a/src/lib/elementary/efl_ui_clock.c
+++ b/src/lib/elementary/efl_ui_clock.c
@@ -2,6 +2,10 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#ifdef _WIN32
6# include <evil_private.h> /* nl_langinfo */
7#endif
8
5#define EFL_ACCESS_OBJECT_PROTECTED 9#define EFL_ACCESS_OBJECT_PROTECTED
6#define EFL_UI_L10N_PROTECTED 10#define EFL_UI_L10N_PROTECTED
7 11
diff --git a/src/lib/elementary/elm_config.c b/src/lib/elementary/elm_config.c
index 6093ca73cd..72bc9f8004 100644
--- a/src/lib/elementary/elm_config.c
+++ b/src/lib/elementary/elm_config.c
@@ -4,7 +4,6 @@
4 4
5#include <Elementary.h> 5#include <Elementary.h>
6#include "elm_priv.h" 6#include "elm_priv.h"
7#include <pwd.h>
8 7
9#include "efl_config_global.eo.h" 8#include "efl_config_global.eo.h"
10 9
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index ca03e4bab6..77d7ab2aac 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -12,6 +12,7 @@
12 12
13#ifdef _WIN32 13#ifdef _WIN32
14# include <direct.h> /* getcwd */ 14# include <direct.h> /* getcwd */
15# include <evil_private.h> /* dlopen,dlclose,etc */
15#endif 16#endif
16 17
17#include <Emotion.h> 18#include <Emotion.h>
diff --git a/src/lib/elementary/elm_prefs.c b/src/lib/elementary/elm_prefs.c
index a320563661..32e684edc2 100644
--- a/src/lib/elementary/elm_prefs.c
+++ b/src/lib/elementary/elm_prefs.c
@@ -2,6 +2,10 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#ifdef _WIN32
6# include <evil_private.h> /* strsep evil_path_absolute */
7#endif
8
5#define EFL_ACCESS_OBJECT_PROTECTED 9#define EFL_ACCESS_OBJECT_PROTECTED
6 10
7#include <Elementary.h> 11#include <Elementary.h>
diff --git a/src/lib/elementary/elm_util.c b/src/lib/elementary/elm_util.c
index 476205c936..101afe9bb3 100644
--- a/src/lib/elementary/elm_util.c
+++ b/src/lib/elementary/elm_util.c
@@ -2,6 +2,10 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#ifdef _WIN32
6# include <evil_private.h> /* nl_langinfo */
7#endif
8
5#include <Elementary.h> 9#include <Elementary.h>
6 10
7#include "elm_priv.h" 11#include "elm_priv.h"
diff --git a/src/lib/ethumb/ethumb.c b/src/lib/ethumb/ethumb.c
index bbfe3a01c5..cf22911921 100644
--- a/src/lib/ethumb/ethumb.c
+++ b/src/lib/ethumb/ethumb.c
@@ -41,7 +41,9 @@
41#include <sys/types.h> 41#include <sys/types.h>
42#include <sys/stat.h> 42#include <sys/stat.h>
43#include <ctype.h> 43#include <ctype.h>
44#include <pwd.h> 44#ifndef _WIN32
45# include <pwd.h>
46#endif
45 47
46#ifdef HAVE_XATTR 48#ifdef HAVE_XATTR
47# include <sys/xattr.h> 49# include <sys/xattr.h>
diff --git a/src/lib/evil/Evil.h b/src/lib/evil/Evil.h
index 7383fe7398..147e45a27b 100644
--- a/src/lib/evil/Evil.h
+++ b/src/lib/evil/Evil.h
@@ -75,11 +75,8 @@
75 * @li @ref Evil_Dlfcn 75 * @li @ref Evil_Dlfcn
76 * @li @ref Evil_Langinfo_Group 76 * @li @ref Evil_Langinfo_Group
77 * @li @ref Evil_Locale_Group 77 * @li @ref Evil_Locale_Group
78 * @li @ref Evil_Pwd_Group
79 * @li @ref Evil_Stdio_Group 78 * @li @ref Evil_Stdio_Group
80 * @li @ref Evil_Main_Group 79 * @li @ref Evil_Main_Group
81 * @li @ref Evil_Inet_Group
82 * @li @ref Evil_Dirent_Group
83 * @li @ref Evil_String_Group 80 * @li @ref Evil_String_Group
84 * @li @ref Evil_Stdlib_Group 81 * @li @ref Evil_Stdlib_Group
85 * @li @ref Evil_Time_Group 82 * @li @ref Evil_Time_Group
@@ -94,9 +91,6 @@ extern "C" {
94#endif 91#endif
95 92
96 93
97typedef unsigned long uid_t;
98typedef unsigned long gid_t;
99
100#ifdef _MSC_VER 94#ifdef _MSC_VER
101# ifdef _WIN64 95# ifdef _WIN64
102typedef __int64 pid_t; 96typedef __int64 pid_t;
diff --git a/src/lib/evil/evil_pwd.c b/src/lib/evil/evil_pwd.c
deleted file mode 100644
index c45f9281a4..0000000000
--- a/src/lib/evil/evil_pwd.c
+++ /dev/null
@@ -1,69 +0,0 @@
1#ifdef HAVE_CONFIG_H
2# include "config.h"
3#endif /* HAVE_CONFIG_H */
4
5#include <stdlib.h>
6#include <stdio.h>
7
8#define _POSIX
9#include <io.h>
10#include <lmcons.h>
11
12#include "evil_private.h"
13#include "pwd.h"
14
15
16static struct passwd pw = { NULL, NULL, 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0 };
17
18struct passwd *
19getpwnam(const char *n)
20{
21 static char user_name[UNLEN + 1];
22 static char user_gecos[UNLEN + 4];
23 TCHAR name[UNLEN + 1];
24 DWORD length;
25 BOOLEAN res;
26#ifdef UNICODE
27 char *a_name;
28# endif /* UNICODE */
29
30 if (!n)
31 return NULL;
32
33 length = UNLEN + 1;
34 res = GetUserName(name, &length);
35 if (!res)
36 return NULL;
37
38#ifdef UNICODE
39 a_name = evil_wchar_to_char(name);
40 if (a_name)
41 {
42 int l;
43
44 l = strlen(a_name);
45 if (l >= PATH_MAX)
46 l = PATH_MAX;
47 memcpy(user_name, a_name, l);
48 user_name[l] = '\0';
49 free(a_name);
50 }
51 else
52 return NULL;
53#else
54 memcpy(user_name, name, strlen(name) + 1);
55#endif /* UNICODE */
56
57 if (strcmp(n, user_name) != 0)
58 return NULL;
59
60 pw.pw_name = user_name;
61 snprintf(user_gecos, sizeof(user_gecos), "%s,,,", user_name);
62 pw.pw_gecos = user_gecos;
63 pw.pw_dir = getenv("USERPROFILE");
64 pw.pw_shell = getenv("SHELL");
65 if (!pw.pw_shell)
66 pw.pw_shell = "cmd.exe";
67
68 return &pw;
69}
diff --git a/src/lib/evil/meson.build b/src/lib/evil/meson.build
index 8ed266c77e..85978d8e9c 100644
--- a/src/lib/evil/meson.build
+++ b/src/lib/evil/meson.build
@@ -16,7 +16,6 @@ if target_machine.system() == 'windows'
16 'evil_unistd.h', 16 'evil_unistd.h',
17 'evil_util.h', 17 'evil_util.h',
18 'dirent.h', 18 'dirent.h',
19 'pwd.h',
20 ] 19 ]
21 evil_header_sys_src = [join_paths('sys','mman.h')] 20 evil_header_sys_src = [join_paths('sys','mman.h')]
22 21
@@ -27,7 +26,6 @@ if target_machine.system() == 'windows'
27 'evil_locale.c', 26 'evil_locale.c',
28 'evil_main.c', 27 'evil_main.c',
29 'evil_mman.c', 28 'evil_mman.c',
30 'evil_pwd.c',
31 'evil_stdio.c', 29 'evil_stdio.c',
32 'evil_stdlib.c', 30 'evil_stdlib.c',
33 'evil_string.c', 31 'evil_string.c',
diff --git a/src/lib/evil/pwd.h b/src/lib/evil/pwd.h
deleted file mode 100644
index 104acd9600..0000000000
--- a/src/lib/evil/pwd.h
+++ /dev/null
@@ -1,89 +0,0 @@
1#ifndef __EVIL_PWD_H__
2#define __EVIL_PWD_H__
3
4
5/**
6 * @file pwd.h
7 * @brief The file that provides functions ported from Unix in pwd.h.
8 * @defgroup Evil_Pwd_Group Pwd.h functions
9 * @ingroup Evil
10 *
11 * This header provides functions ported from Unix in pwd.h.
12 *
13 * @{
14 */
15
16
17#include <time.h>
18
19#include <Evil.h>
20
21#ifdef EAPI
22# undef EAPI
23#endif
24
25#ifdef _WIN32
26# ifdef EFL_BUILD
27# ifdef DLL_EXPORT
28# define EAPI __declspec(dllexport)
29# else
30# define EAPI
31# endif
32# else
33# define EAPI __declspec(dllimport)
34# endif
35#endif
36
37
38#ifdef __cplusplus
39extern "C" {
40#endif
41
42
43/**
44 * @struct passwd
45 * @brief A structure that describes a password.
46 */
47struct passwd {
48 char *pw_name; /**< user name */
49 char *pw_passwd; /**< encrypted password (always @c NULL) */
50 uid_t pw_uid; /**< user uid (always 0) */
51 gid_t pw_gid; /**< user gid (always 0) */
52 time_t pw_change; /**< password change time (always 0) */
53 char *pw_class; /**< user access class (always @c NULL) */
54 char *pw_gecos; /**< Honeywell login info */
55 char *pw_dir; /**< home directory */
56 char *pw_shell; /**< default shell */
57 time_t pw_expire; /**< account expiration (always 0) */
58 int pw_fields; /**< internal: fields filled in (always 0) */
59};
60
61/**
62 * @brief Return a passwd structure.
63 *
64 * @param n The name of the user.
65 * @return A stacally allocated passwd structure.
66 *
67 * This function fills a static buffer @ref passwd with the user name @p n.
68 *
69 * Conformity: None.
70 *
71 * Supported OS: Windows XP.
72 */
73EAPI struct passwd *getpwnam(const char *n);
74
75
76#ifdef __cplusplus
77}
78#endif
79
80#undef EAPI
81#define EAPI
82
83
84/**
85 * @}
86 */
87
88
89#endif /* __EVIL_PWD_H__ */
diff --git a/src/tests/eina/eina_test_vpath.c b/src/tests/eina/eina_test_vpath.c
index 7a38712acc..1282cc4f2f 100644
--- a/src/tests/eina/eina_test_vpath.c
+++ b/src/tests/eina/eina_test_vpath.c
@@ -5,7 +5,9 @@
5#include <Eina.h> 5#include <Eina.h>
6#include <check.h> 6#include <check.h>
7#include "eina_suite.h" 7#include "eina_suite.h"
8#include <pwd.h> 8#ifndef _WIN32
9# include <pwd.h>
10#endif
9 11
10EFL_START_TEST(eina_test_vpath_valid) 12EFL_START_TEST(eina_test_vpath_valid)
11{ 13{
diff --git a/src/tests/elementary/spec/efl_test_format.c b/src/tests/elementary/spec/efl_test_format.c
index cd2e698051..c3fa7d42f5 100644
--- a/src/tests/elementary/spec/efl_test_format.c
+++ b/src/tests/elementary/spec/efl_test_format.c
@@ -2,6 +2,10 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#ifdef _WIN32
6# include <evil_private.h> /* setlocale strptime */
7#endif
8
5#define EFL_UI_FORMAT_PROTECTED /* To access internal methods */ 9#define EFL_UI_FORMAT_PROTECTED /* To access internal methods */
6 10
7#include <Efl_Ui.h> 11#include <Efl_Ui.h>