summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Dilly <bdilly@profusion.mobi>2012-12-02 22:21:47 +0000
committerBruno Dilly <bdilly@profusion.mobi>2012-12-02 22:21:47 +0000
commit5ee0923d0c98959a51dadd5bf732b797f2228644 (patch)
treeaabbc6521c248c5d3b955b5a51e9bf5fb48c610d
parent09358c71d149fec793a8cc7f72a70d417ccae9d6 (diff)
emotion: fix build warning without eeze
SVN revision: 79991
-rw-r--r--legacy/emotion/src/lib/emotion_main.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/legacy/emotion/src/lib/emotion_main.c b/legacy/emotion/src/lib/emotion_main.c
index 52b1baa597..01c36f298e 100644
--- a/legacy/emotion/src/lib/emotion_main.c
+++ b/legacy/emotion/src/lib/emotion_main.c
@@ -38,11 +38,10 @@ void *alloca (size_t);
38# ifdef HAVE_V4L2 38# ifdef HAVE_V4L2
39# include <linux/videodev2.h> 39# include <linux/videodev2.h>
40# endif 40# endif
41
42# include <Ecore.h>
43# include <Eeze.h> 41# include <Eeze.h>
44#endif 42#endif
45 43
44#include <Ecore.h>
46#include <Eet.h> 45#include <Eet.h>
47 46
48#include "Emotion.h" 47#include "Emotion.h"
@@ -202,9 +201,6 @@ _emotion_webcams_data(void)
202 return _webcams_edd; 201 return _webcams_edd;
203} 202}
204 203
205#ifdef EMOTION_HAVE_EEZE
206static Eeze_Udev_Watch *eeze_watcher = NULL;
207
208static void 204static void
209emotion_webcam_destroy(Emotion_Webcam *ew) 205emotion_webcam_destroy(Emotion_Webcam *ew)
210{ 206{
@@ -217,6 +213,9 @@ emotion_webcam_destroy(Emotion_Webcam *ew)
217 free(ew); 213 free(ew);
218} 214}
219 215
216#ifdef EMOTION_HAVE_EEZE
217static Eeze_Udev_Watch *eeze_watcher = NULL;
218
220static void 219static void
221_emotion_check_device(Emotion_Webcam *ew) 220_emotion_check_device(Emotion_Webcam *ew)
222{ 221{
@@ -396,11 +395,9 @@ emotion_shutdown(void)
396 395
397 EINA_LIST_FREE(_emotion_webcams->webcams, ew) 396 EINA_LIST_FREE(_emotion_webcams->webcams, ew)
398 { 397 {
399#ifdef EMOTION_HAVE_EEZE
400 /* There is currently no way to refcount from the outside, this help, but could lead to some issue */ 398 /* There is currently no way to refcount from the outside, this help, but could lead to some issue */
401 EINA_REFCOUNT_UNREF(ew) 399 EINA_REFCOUNT_UNREF(ew)
402 emotion_webcam_destroy(ew); 400 emotion_webcam_destroy(ew);
403#endif
404 } 401 }
405 free(_emotion_webcams); 402 free(_emotion_webcams);
406 _emotion_webcams = NULL; 403 _emotion_webcams = NULL;