warning-- for eina locks

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@59102 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/cache/evas_cache_image.c b/src/lib/cache/evas_cache_image.c
index c34a580..85064b7 100644 (file)
--- a/src/lib/cache/evas_cache_image.c
+++ b/src/lib/cache/evas_cache_image.c
@@ -31,8 +31,8 @@ struct _Evas_Cache_Preload
    Image_Entry *ie;
 };
 
-static LK(engine_lock) = PTHREAD_MUTEX_INITIALIZER;
-static LK(wakeup) = PTHREAD_MUTEX_INITIALIZER;
+static LK(engine_lock) = EINA_LOCK_INITIALIZER; 
+static LK(wakeup) = EINA_LOCK_INITIALIZER;
 
 static pthread_cond_t cond_wakeup = PTHREAD_COND_INITIALIZER;
 

diff --git a/src/lib/cache/evas_preload.c b/src/lib/cache/evas_preload.c
index 2a43313..f4b3521 100644 (file)
--- a/src/lib/cache/evas_preload.c
+++ b/src/lib/cache/evas_preload.c
@@ -45,7 +45,7 @@ struct _Evas_Preload_Pthread_Data
 static int _threads_count = 0;
 static Evas_Preload_Pthread_Worker *_workers = NULL;
 
-static LK(_mutex) = PTHREAD_MUTEX_INITIALIZER;
+static LK(_mutex) = EINA_LOCK_INITIALIZER;
 
 static void
 _evas_preload_thread_end(void *data)

diff --git a/src/lib/engines/common/evas_image_scalecache.c b/src/lib/engines/common/evas_image_scalecache.c
index b200f20..92b9f08 100644 (file)
--- a/src/lib/engines/common/evas_image_scalecache.c
+++ b/src/lib/engines/common/evas_image_scalecache.c
@@ -399,7 +399,7 @@ evas_common_rgba_image_scalecache_prepare(Image_Entry *ie, RGBA_Image *dst __UNU
 {
 #ifdef SCALECACHE
    int locked = 0;
-   Eina_Bool ret;
+   Eina_Lock_Result ret;
    RGBA_Image *im = (RGBA_Image *)ie;
    Scaleitem *sci;
    if (!im->image.data) return;
@@ -420,7 +420,7 @@ evas_common_rgba_image_scalecache_prepare(Image_Entry *ie, RGBA_Image *dst __UNU
              slpt += slp;
              slp++;
              ret = LKT(im->cache.lock);
-             if (ret == 2) // MAGIC for now
+             if (ret == EINA_LOCK_DEADLOCK)
                {
                   printf("WARNING: DEADLOCK on image %p (%s)\n", im, ie->file);
                }
@@ -437,7 +437,7 @@ evas_common_rgba_image_scalecache_prepare(Image_Entry *ie, RGBA_Image *dst __UNU
              LKDBG(im->cache.lock);
           }
      }
-   else if (ret == 2) // MAGIC for now
+   else if (ret == EINA_LOCK_DEADLOCK)
      {
         printf("WARNING: DEADLOCK on image %p (%s)\n", im, ie->file);
      }