summaryrefslogtreecommitdiff
path: root/legacy/emotion
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2011-12-30 15:06:24 +0000
committerCedric BAIL <cedric.bail@free.fr>2011-12-30 15:06:24 +0000
commit6b961d47722ded6370f99e375146af4b2d937aab (patch)
tree9c95f714364b48f16b1d709112c481cd03d1c349 /legacy/emotion
parent5924c8bacc90eb3413205b5a7159f0dfe3c63532 (diff)
emotion: fix build with Eina_Semaphore.
SVN revision: 66697
Diffstat (limited to 'legacy/emotion')
-rw-r--r--legacy/emotion/m4/emotion_check.m42
-rw-r--r--legacy/emotion/src/generic_players/vlc/emotion_generic_vlc.c1
-rw-r--r--legacy/emotion/src/modules/generic/Emotion_Generic_Plugin.h6
3 files changed, 3 insertions, 6 deletions
diff --git a/legacy/emotion/m4/emotion_check.m4 b/legacy/emotion/m4/emotion_check.m4
index 8c43a687d6..ebd7e7e320 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],
56requirement="" 56requirement=""
57 57
58PKG_CHECK_MODULES([GENERIC_VLC], 58PKG_CHECK_MODULES([GENERIC_VLC],
59 [libvlc >= 0.9], 59 [libvlc >= 0.9 eina >= 1.1.99],
60 [ 60 [
61 have_dep="yes" 61 have_dep="yes"
62 requirement="libvlc" 62 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 244592951a..0be1ee922d 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 @@
18#include <signal.h> 18#include <signal.h>
19 19
20#include <vlc/vlc.h> 20#include <vlc/vlc.h>
21
21#include <Emotion_Generic_Plugin.h> 22#include <Emotion_Generic_Plugin.h>
22 23
23enum _Thread_Events { 24enum _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 655201a9ee..2dff814a66 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 @@
7#include <sys/stat.h> 7#include <sys/stat.h>
8#include <fcntl.h> 8#include <fcntl.h>
9 9
10#ifdef _WIN32 10#include <Eina.h>
11# include <windows.h>
12#else
13#include <semaphore.h>
14#endif
15 11
16#define DEFAULTWIDTH 320 12#define DEFAULTWIDTH 320
17#define DEFAULTHEIGHT 240 13#define DEFAULTHEIGHT 240