From 48c10cd414750da9c0532683fc8dd9df3c62a53e Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Thu, 13 Dec 2012 18:27:24 +0000 Subject: eina: backport fix to EINA_INLIST_FOREACH_SAFE macro SVN revision: 80887 --- ChangeLog | 4 ++++ NEWS | 6 +++++- src/include/eina_inlist.h | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2580006..402e3ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -376,3 +376,7 @@ 2012-12-12 Nicolas Aguirre * Fix define EINA_UNUSED for win32 builds + +2012-12-13 Lucas De Marchi + + * Fix EINA_INLIST_FOREACH_SAFE macro diff --git a/NEWS b/NEWS index df7ab71..d9c5eba 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,8 @@ -Eina 1.7.3 +Eina 1.7.4 + +Changes since Eina 1.7.3: + + * Fix EINA_INLIST_FOREACH_SAFE macro Changes since Eina 1.7.2: ------------------------- diff --git a/src/include/eina_inlist.h b/src/include/eina_inlist.h index e4de689..c1c94df 100644 --- a/src/include/eina_inlist.h +++ b/src/include/eina_inlist.h @@ -803,7 +803,7 @@ EAPI Eina_Inlist *eina_inlist_sort(Eina_Inlist *head, Eina_Compare_Cb func); #define EINA_INLIST_FOREACH_SAFE(list, list2, l) \ for (l = (list ? _EINA_INLIST_CONTAINER(l, list) : NULL), list2 = l ? ((EINA_INLIST_GET(l) ? EINA_INLIST_GET(l)->next : NULL)) : NULL; \ l; \ - l = _EINA_INLIST_CONTAINER(l, list2), list2 = list2 ? list2->next : NULL) + l = list2 ? _EINA_INLIST_CONTAINER(l, list2) : NULL, list2 = list2 ? list2->next : NULL) /** * @def EINA_INLIST_REVERSE_FOREACH * @param list The list to be reversed. -- cgit v1.2.1