From c207c758324f9ec888251a5148d82d061d441418 Mon Sep 17 00:00:00 2001 From: cedric Date: Wed, 5 Dec 2012 05:30:47 +0000 Subject: [PATCH] ecore: backport r80206. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/branches/ecore-1.7@80208 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- AUTHORS | 1 + ChangeLog | 4 ++++ NEWS | 2 +- src/lib/ecore_evas/ecore_evas_extn.c | 4 ++-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/AUTHORS b/AUTHORS index 2ec6d2b..ebceb33 100644 --- a/AUTHORS +++ b/AUTHORS @@ -56,3 +56,4 @@ Patryk Kaczmarek Daniel Willmann Michal Pakula vel Rutka Alexey Yakovenko +Robert David diff --git a/ChangeLog b/ChangeLog index 77f7179..2d8278e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -994,3 +994,7 @@ 2012-11-27 Alexey Yakovenko * Fix ecore_evas_sdl window resize bug. + +2012-12-05 Robert David + + * Fix Ecore_Evas_Extn on Solaris 11. diff --git a/NEWS b/NEWS index 0898bd1..ed32364 100644 --- a/NEWS +++ b/NEWS @@ -23,7 +23,7 @@ Fixes: * ecore_wayland: - Update to work with latest wayland (0.99) from git. - Fix leak of struct wl_registry - + * ecore_evas: fix Ecore_Evas_Extn build on Solaris 11. Changes since Ecore 1.2.0: -------------------------- diff --git a/src/lib/ecore_evas/ecore_evas_extn.c b/src/lib/ecore_evas/ecore_evas_extn.c index 901809f..13af5ec 100644 --- a/src/lib/ecore_evas/ecore_evas_extn.c +++ b/src/lib/ecore_evas/ecore_evas_extn.c @@ -442,7 +442,7 @@ _ecore_evas_socket_lock(Ecore_Evas *ee) if (extn->file.have_lock) return; extn->file.have_lock = EINA_TRUE; if (_ecore_evas_lock_other_have(ee)) return; - flock(extn->file.lockfd, LOCK_EX); + lockf(extn->file.lockfd, F_LOCK, 0); extn->file.have_real_lock = EINA_TRUE; } @@ -457,7 +457,7 @@ _ecore_evas_socket_unlock(Ecore_Evas *ee) if (!extn->file.have_lock) return; extn->file.have_lock = EINA_FALSE; if (!extn->file.have_real_lock) return; - flock(extn->file.lockfd, LOCK_UN); + lockf(extn->file.lockfd, F_ULOCK, 0); } static void -- 2.7.4