jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=aef05c26d6eb1636304477371a1debcb3c12bea7

commit aef05c26d6eb1636304477371a1debcb3c12bea7
Author: Jean-Philippe Andre <[email protected]>
Date:   Wed Nov 29 20:20:49 2017 +0900

    eolian: Warn less on duplicate beta APIs
    
    The check was only done on one of the two functions, resulting in some
    unwanted warnings.
    
    EOLIAN_WARN_FUNC_DUPLICATES=1 will show non-beta warnings.
    EOLIAN_WARN_FUNC_DUPLICATES=2 will still show all warnings.
---
 src/lib/eolian/database_validate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/eolian/database_validate.c 
b/src/lib/eolian/database_validate.c
index 3651d7ead2..da83072d50 100644
--- a/src/lib/eolian/database_validate.c
+++ b/src/lib/eolian/database_validate.c
@@ -328,7 +328,7 @@ _validate_function(Eolian_Function *func, Eina_Hash *nhash)
                  "%sfunction '%s' redefined (originally at %s:%d:%d)",
                  func->is_beta ? "beta " : "", func->name, ofunc->base.file,
                  ofunc->base.line, ofunc->base.column);
-        if (!func->is_beta || (_duplicates_warn > 1))
+        if ((!func->is_beta && !ofunc->is_beta) || (_duplicates_warn > 1))
           _obj_error(&func->base, buf);
      }
 

-- 


Reply via email to