From 6b961d47722ded6370f99e375146af4b2d937aab Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Fri, 30 Dec 2011 15:06:24 +0000 Subject: [PATCH] emotion: fix build with Eina_Semaphore. SVN revision: 66697 --- legacy/emotion/m4/emotion_check.m4 | 2 +- legacy/emotion/src/generic_players/vlc/emotion_generic_vlc.c | 1 + legacy/emotion/src/modules/generic/Emotion_Generic_Plugin.h | 6 +----- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/legacy/emotion/m4/emotion_check.m4 b/legacy/emotion/m4/emotion_check.m4 index 8c43a68..ebd7e7e 100644 --- a/legacy/emotion/m4/emotion_check.m4 +++ b/legacy/emotion/m4/emotion_check.m4 @@ -56,7 +56,7 @@ AC_DEFUN([EMOTION_CHECK_DEP_GENERIC_VLC], requirement="" PKG_CHECK_MODULES([GENERIC_VLC], - [libvlc >= 0.9], + [libvlc >= 0.9 eina >= 1.1.99], [ have_dep="yes" requirement="libvlc" diff --git a/legacy/emotion/src/generic_players/vlc/emotion_generic_vlc.c b/legacy/emotion/src/generic_players/vlc/emotion_generic_vlc.c index 2445929..0be1ee9 100644 --- a/legacy/emotion/src/generic_players/vlc/emotion_generic_vlc.c +++ b/legacy/emotion/src/generic_players/vlc/emotion_generic_vlc.c @@ -18,6 +18,7 @@ #include #include + #include enum _Thread_Events { diff --git a/legacy/emotion/src/modules/generic/Emotion_Generic_Plugin.h b/legacy/emotion/src/modules/generic/Emotion_Generic_Plugin.h index 655201a..2dff814 100644 --- a/legacy/emotion/src/modules/generic/Emotion_Generic_Plugin.h +++ b/legacy/emotion/src/modules/generic/Emotion_Generic_Plugin.h @@ -7,11 +7,7 @@ #include #include -#ifdef _WIN32 -# include -#else -#include -#endif +#include #define DEFAULTWIDTH 320 #define DEFAULTHEIGHT 240 -- 2.7.4