diff options
| author | Vincent Torri <vincent.torri@gmail.com> | 2018-01-03 06:23:10 +0100 |
|---|---|---|
| committer | Cedric BAIL <cedric@osg.samsung.com> | 2018-01-04 12:59:47 -0800 |
| commit | 4ae6eeb2cffa68336beedaeacf8874c93f15feda (patch) | |
| tree | 9c212d00728a35922c468725a382cd6c0fb40d63 /src/lib/evas | |
| parent | 6c42801bac1343629ded606e6960bb656ec86ff8 (diff) | |
| download | efl-4ae6eeb2cffa68336beedaeacf8874c93f15feda.tar.gz | |
efl: remove _MSC_VER (Visual Studio macro) usage in source code
Diffstat (limited to 'src/lib/evas')
| -rw-r--r-- | src/lib/evas/canvas/evas_async_events.c | 4 | ||||
| -rw-r--r-- | src/lib/evas/canvas/evas_font_dir.c | 6 | ||||
| -rw-r--r-- | src/lib/evas/file/evas_module.c | 2 | ||||
| -rw-r--r-- | src/lib/evas/file/evas_path.c | 6 | ||||
| -rw-r--r-- | src/lib/evas/include/evas_common_private.h | 5 |
5 files changed, 6 insertions, 17 deletions
diff --git a/src/lib/evas/canvas/evas_async_events.c b/src/lib/evas/canvas/evas_async_events.c index ad03284b83..5cbf90a201 100644 --- a/src/lib/evas/canvas/evas_async_events.c +++ b/src/lib/evas/canvas/evas_async_events.c @@ -2,9 +2,7 @@ # include <config.h> #endif -#ifndef _MSC_VER -# include <unistd.h> -#endif +#include <unistd.h> #include <errno.h> #ifdef _WIN32 diff --git a/src/lib/evas/canvas/evas_font_dir.c b/src/lib/evas/canvas/evas_font_dir.c index cbdef108ff..f73b77dab1 100644 --- a/src/lib/evas/canvas/evas_font_dir.c +++ b/src/lib/evas/canvas/evas_font_dir.c @@ -66,10 +66,8 @@ static FcConfig *fc_config = NULL; /* FIXME move these helper function to eina_file or eina_path */ /* get the casefold feature! */ #include <fnmatch.h> -#ifndef _MSC_VER -# include <unistd.h> -# include <sys/param.h> -#endif +#include <unistd.h> +#include <sys/param.h> int _file_path_is_full_path(const char *path) { diff --git a/src/lib/evas/file/evas_module.c b/src/lib/evas/file/evas_module.c index bdcd5e8500..b4cabf845b 100644 --- a/src/lib/evas/file/evas_module.c +++ b/src/lib/evas/file/evas_module.c @@ -147,7 +147,6 @@ evas_module_paths_init(void) evas_module_paths = _evas_module_append(evas_module_paths, path); /* 2. PREFIX/lib/evas/modules/ */ -#ifndef _MSC_VER path = PACKAGE_LIB_DIR "/evas/modules"; if (!eina_list_search_unsorted(evas_module_paths, (Eina_Compare_Cb) strcmp, path)) { @@ -155,7 +154,6 @@ evas_module_paths_init(void) if (path) evas_module_paths = _evas_module_append(evas_module_paths, path); } -#endif } #define EVAS_EINA_STATIC_MODULE_DEFINE(Tn, Name) \ diff --git a/src/lib/evas/file/evas_path.c b/src/lib/evas/file/evas_path.c index 6144759616..19eabe4835 100644 --- a/src/lib/evas/file/evas_path.c +++ b/src/lib/evas/file/evas_path.c @@ -13,10 +13,8 @@ #include <sys/stat.h> /* get the casefold feature! */ #include <fnmatch.h> -#ifndef _MSC_VER -# include <unistd.h> -# include <sys/param.h> -#endif +#include <unistd.h> +#include <sys/param.h> #ifdef _WIN32 # include <Evil.h> diff --git a/src/lib/evas/include/evas_common_private.h b/src/lib/evas/include/evas_common_private.h index 6518b16f93..27332c0c67 100644 --- a/src/lib/evas/include/evas_common_private.h +++ b/src/lib/evas/include/evas_common_private.h @@ -21,11 +21,8 @@ #include <sys/stat.h> #include <time.h> #include <ctype.h> - -#ifndef _MSC_VER -# include <stdint.h> +#include <stdint.h> #include <unistd.h> -#endif #ifdef _WIN32 # include <Evil.h> |