projects
/
platform
/
upstream
/
efl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5924c8b
)
emotion: fix build with Eina_Semaphore.
author
Cedric BAIL
<cedric.bail@free.fr>
Fri, 30 Dec 2011 15:06:24 +0000
(15:06 +0000)
committer
Cedric BAIL
<cedric.bail@free.fr>
Fri, 30 Dec 2011 15:06:24 +0000
(15:06 +0000)
SVN revision: 66697
legacy/emotion/m4/emotion_check.m4
patch
|
blob
|
history
legacy/emotion/src/generic_players/vlc/emotion_generic_vlc.c
patch
|
blob
|
history
legacy/emotion/src/modules/generic/Emotion_Generic_Plugin.h
patch
|
blob
|
history
diff --git
a/legacy/emotion/m4/emotion_check.m4
b/legacy/emotion/m4/emotion_check.m4
index
8c43a68
..
ebd7e7e
100644
(file)
--- 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
(file)
--- 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 <signal.h>
#include <vlc/vlc.h>
+
#include <Emotion_Generic_Plugin.h>
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
(file)
--- 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 <sys/stat.h>
#include <fcntl.h>
-#ifdef _WIN32
-# include <windows.h>
-#else
-#include <semaphore.h>
-#endif
+#include <Eina.h>
#define DEFAULTWIDTH 320
#define DEFAULTHEIGHT 240