summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2012-12-05 02:52:03 +0000
committerCedric BAIL <cedric.bail@free.fr>2012-12-05 02:52:03 +0000
commitf03023b28b891c3d7a9449802f489ed3de6050cc (patch)
tree9b7b9bf4da427c4a684fa4cf49956f43b1a387bc
parent19463c7e2401acccea0072b2807a8c6311a887a1 (diff)
efl: Fix build of Ecore_Evas_Extn.
Patch by Robert David <robert.david.public@gmail.com> SVN revision: 80206
-rw-r--r--AUTHORS1
-rw-r--r--ChangeLog5
-rw-r--r--NEWS1
-rw-r--r--src/lib/ecore_evas/ecore_evas_extn.c4
4 files changed, 9 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index c1c1ee953e..27b13c7435 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -183,6 +183,7 @@ Yakov Goldberg <yakov.g@samsung.com>
183Eduardo Lima (Etrunko) <eblima@gmail.com> 183Eduardo Lima (Etrunko) <eblima@gmail.com>
184Alexey Yakovenko <wakeroid@gmail.com> 184Alexey Yakovenko <wakeroid@gmail.com>
185Myoungwoon Roy Kim(roy_kim) <myoungwoon.kim@samsung.com> <myoungwoon@gmail.com> 185Myoungwoon Roy Kim(roy_kim) <myoungwoon.kim@samsung.com> <myoungwoon@gmail.com>
186Robert David <robert.david.public@gmail.com>
186 187
187Embryo 188Embryo
188------ 189------
diff --git a/ChangeLog b/ChangeLog
index e3b698ac9e..b4bd2e9982 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -108,3 +108,8 @@
1082012-11-20 ChunEon Park (Hermet) 1082012-11-20 ChunEon Park (Hermet)
109 109
110 * Fix the evas memory leak - eina_rectangles allocated internally. 110 * Fix the evas memory leak - eina_rectangles allocated internally.
111
1122012-12-05 Cedric Bail
113
114 * Fix build of Ecore_Evas_Extn on Solaris 11.
115
diff --git a/NEWS b/NEWS
index b76af1d1b3..b0f87aae5c 100644
--- a/NEWS
+++ b/NEWS
@@ -29,3 +29,4 @@ Fixes:
29 to properly handle GL_SCISSOR_BOX and GL_VIEWPORT parameters. 29 to properly handle GL_SCISSOR_BOX and GL_VIEWPORT parameters.
30 * Fixed textblock textprop leak. 30 * Fixed textblock textprop leak.
31 * Fixed evas_object_box to reset size_hint_min to zero when no child. 31 * Fixed evas_object_box to reset size_hint_min to zero when no child.
32 * 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 2e1dac5cf8..61840723c7 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)
442 if (extn->file.have_lock) return; 442 if (extn->file.have_lock) return;
443 extn->file.have_lock = EINA_TRUE; 443 extn->file.have_lock = EINA_TRUE;
444 if (_ecore_evas_lock_other_have(ee)) return; 444 if (_ecore_evas_lock_other_have(ee)) return;
445 flock(extn->file.lockfd, LOCK_EX); 445 lockf(extn->file.lockfd, F_ULOCK, 0);
446 extn->file.have_real_lock = EINA_TRUE; 446 extn->file.have_real_lock = EINA_TRUE;
447} 447}
448 448
@@ -457,7 +457,7 @@ _ecore_evas_socket_unlock(Ecore_Evas *ee)
457 if (!extn->file.have_lock) return; 457 if (!extn->file.have_lock) return;
458 extn->file.have_lock = EINA_FALSE; 458 extn->file.have_lock = EINA_FALSE;
459 if (!extn->file.have_real_lock) return; 459 if (!extn->file.have_real_lock) return;
460 flock(extn->file.lockfd, LOCK_UN); 460 lockf(extn->file.lockfd, F_ULOCK, 0);
461} 461}
462 462
463static void 463static void