From: Cedric BAIL Date: Wed, 5 Dec 2012 02:52:03 +0000 (+0000) Subject: efl: Fix build of Ecore_Evas_Extn. X-Git-Tag: submit/devel/efl/20131022.203902~3114 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f03023b28b891c3d7a9449802f489ed3de6050cc;p=platform%2Fupstream%2Fefl.git efl: Fix build of Ecore_Evas_Extn. Patch by Robert David SVN revision: 80206 --- diff --git a/AUTHORS b/AUTHORS index c1c1ee9..27b13c7 100644 --- a/AUTHORS +++ b/AUTHORS @@ -183,6 +183,7 @@ Yakov Goldberg Eduardo Lima (Etrunko) Alexey Yakovenko Myoungwoon Roy Kim(roy_kim) +Robert David Embryo ------ diff --git a/ChangeLog b/ChangeLog index e3b698a..b4bd2e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -108,3 +108,8 @@ 2012-11-20 ChunEon Park (Hermet) * Fix the evas memory leak - eina_rectangles allocated internally. + +2012-12-05 Cedric Bail + + * Fix build of Ecore_Evas_Extn on Solaris 11. + diff --git a/NEWS b/NEWS index b76af1d..b0f87aa 100644 --- a/NEWS +++ b/NEWS @@ -29,3 +29,4 @@ Fixes: to properly handle GL_SCISSOR_BOX and GL_VIEWPORT parameters. * Fixed textblock textprop leak. * Fixed evas_object_box to reset size_hint_min to zero when no child. + * Fix build of Ecore_Evas_Extn on Solaris. \ No newline at end of file diff --git a/src/lib/ecore_evas/ecore_evas_extn.c b/src/lib/ecore_evas/ecore_evas_extn.c index 2e1dac5..6184072 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_ULOCK, 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