From 5ee0923d0c98959a51dadd5bf732b797f2228644 Mon Sep 17 00:00:00 2001 From: Bruno Dilly Date: Sun, 2 Dec 2012 22:21:47 +0000 Subject: [PATCH] emotion: fix build warning without eeze SVN revision: 79991 --- legacy/emotion/src/lib/emotion_main.c | 11 ++++------- 1 file 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); # ifdef HAVE_V4L2 # include # endif - -# include # include #endif +#include #include #include "Emotion.h" @@ -202,9 +201,6 @@ _emotion_webcams_data(void) return _webcams_edd; } -#ifdef EMOTION_HAVE_EEZE -static Eeze_Udev_Watch *eeze_watcher = NULL; - static void emotion_webcam_destroy(Emotion_Webcam *ew) { @@ -217,6 +213,9 @@ emotion_webcam_destroy(Emotion_Webcam *ew) free(ew); } +#ifdef EMOTION_HAVE_EEZE +static Eeze_Udev_Watch *eeze_watcher = NULL; + static void _emotion_check_device(Emotion_Webcam *ew) { @@ -396,11 +395,9 @@ emotion_shutdown(void) EINA_LIST_FREE(_emotion_webcams->webcams, ew) { -#ifdef EMOTION_HAVE_EEZE /* There is currently no way to refcount from the outside, this help, but could lead to some issue */ EINA_REFCOUNT_UNREF(ew) emotion_webcam_destroy(ew); -#endif } free(_emotion_webcams); _emotion_webcams = NULL;