diff options
author | Vincent Torri <vincent.torri@gmail.com> | 2017-09-23 18:02:44 +0200 |
---|---|---|
committer | Cedric BAIL <cedric@osg.samsung.com> | 2017-09-26 10:17:04 -0700 |
commit | 9b416d236079da8603c9c3cc4b5f3d013d74976e (patch) | |
tree | fdf9e7246eed2cf5449e1c14355836d6a4356de5 | |
parent | 448244360ff97c0984a3d1a087865283af90ad6e (diff) |
eina: remove EFL_HAVE_WIN32_THREADS define as it is unused since winpthread is used
Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
Diffstat (limited to '')
-rw-r--r-- | m4/efl_threads.m4 | 2 | ||||
-rw-r--r-- | src/lib/eina/eina_main.c | 6 | ||||
-rw-r--r-- | src/lib/eina/eina_sched.c | 8 |
3 files changed, 1 insertions, 15 deletions
diff --git a/m4/efl_threads.m4 b/m4/efl_threads.m4 index 0c25e2c2df..54a5fc6d77 100644 --- a/m4/efl_threads.m4 +++ b/m4/efl_threads.m4 | |||
@@ -7,7 +7,7 @@ dnl Macro that check if POSIX or Win32 threads library is available or not. | |||
7 | dnl Usage: EFL_CHECK_THREADS(ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]) | 7 | dnl Usage: EFL_CHECK_THREADS(ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]) |
8 | dnl Call AC_SUBST(EFL_PTHREAD_CFLAGS) | 8 | dnl Call AC_SUBST(EFL_PTHREAD_CFLAGS) |
9 | dnl Call AC_SUBST(EFL_PTHREAD_LIBS) | 9 | dnl Call AC_SUBST(EFL_PTHREAD_LIBS) |
10 | dnl Defines EFL_HAVE_POSIX_THREADS or EFL_HAVE_WIN32_THREADS, and EFL_HAVE_THREADS | 10 | dnl Defines EFL_HAVE_THREADS |
11 | 11 | ||
12 | AC_DEFUN([EFL_CHECK_THREADS], | 12 | AC_DEFUN([EFL_CHECK_THREADS], |
13 | [ | 13 | [ |
diff --git a/src/lib/eina/eina_main.c b/src/lib/eina/eina_main.c index 38865eb57d..ba88e0a506 100644 --- a/src/lib/eina/eina_main.c +++ b/src/lib/eina/eina_main.c | |||
@@ -23,12 +23,6 @@ | |||
23 | #include <stdio.h> | 23 | #include <stdio.h> |
24 | #include <time.h> | 24 | #include <time.h> |
25 | 25 | ||
26 | #ifdef EFL_HAVE_WIN32_THREADS | ||
27 | # define WIN32_LEAN_AND_MEAN | ||
28 | # include <windows.h> | ||
29 | # undef WIN32_LEAN_AND_MEAN | ||
30 | #endif | ||
31 | |||
32 | #ifdef EFL_HAVE_THREADS | 26 | #ifdef EFL_HAVE_THREADS |
33 | # ifdef HAVE_SYS_TYPES_H | 27 | # ifdef HAVE_SYS_TYPES_H |
34 | # include <sys/types.h> | 28 | # include <sys/types.h> |
diff --git a/src/lib/eina/eina_sched.c b/src/lib/eina/eina_sched.c index 006f23fa4e..bf47d806b1 100644 --- a/src/lib/eina/eina_sched.c +++ b/src/lib/eina/eina_sched.c | |||
@@ -28,14 +28,6 @@ | |||
28 | # include <errno.h> | 28 | # include <errno.h> |
29 | #endif | 29 | #endif |
30 | 30 | ||
31 | #ifdef EFL_HAVE_WIN32_THREADS | ||
32 | # ifndef WIN32_LEAN_AND_MEAN | ||
33 | # define WIN32_LEAN_AND_MEAN | ||
34 | # endif | ||
35 | # include <windows.h> | ||
36 | # undef WIN32_LEAN_AND_MEAN | ||
37 | #endif | ||
38 | |||
39 | #include "eina_sched.h" | 31 | #include "eina_sched.h" |
40 | #include "eina_log.h" | 32 | #include "eina_log.h" |
41 | 33 | ||