From 3d41b74146d41617b0f328a2988184680c0367d9 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Wed, 17 Dec 2008 13:03:00 +0000 Subject: [PATCH] Update ac_attribute macro and remove __UNUSED__ declaration from eina. SVN revision: 38179 --- legacy/ecore/m4/ac_attribute.m4 | 52 ++++++++++++++++++++----- legacy/efreet/m4/ac_attribute.m4 | 53 ++++++++++++++++++++------ legacy/eina/src/include/eina_private.h | 6 +++ legacy/eina/src/include/eina_types.h | 6 --- legacy/evas/configure.ac | 1 + legacy/evas/m4/ac_attribute.m4 | 46 ++++++++++++++++++++++ 6 files changed, 137 insertions(+), 27 deletions(-) create mode 100644 legacy/evas/m4/ac_attribute.m4 diff --git a/legacy/ecore/m4/ac_attribute.m4 b/legacy/ecore/m4/ac_attribute.m4 index 46c1a42291..34bb4dbf2f 100644 --- a/legacy/ecore/m4/ac_attribute.m4 +++ b/legacy/ecore/m4/ac_attribute.m4 @@ -1,14 +1,46 @@ +dnl Copyright (C) 2004-2008 Kim Woelders +dnl Copyright (C) 2008 Vincent Torri +dnl That code is public domain and can be freely used or copied. +dnl Originally snatched from somewhere... + +dnl Macro for checking if the compiler supports __atribute__ + +dnl Usage: AC_C___ATTRIBUTE__ +dnl call AC_DEFINE for HAVE___ATTRIBUTE__ and __UNUSED__ +dnl if the compiler supports __attribute__, HAVE___ATTRIBUTE__ is +dnl defined to 1 and __UNUSED__ is defined to __attribute__((unused)) +dnl otherwise, HAVE___ATTRIBUTE__ is not defined and __UNUSED__ is +dnl defined to nothing. AC_DEFUN([AC_C___ATTRIBUTE__], [ - AC_MSG_CHECKING(for __attribute__) - AC_CACHE_VAL(ac_cv___attribute__, [ - AC_TRY_COMPILE([#include ], - [int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }], - ac_cv___attribute__=yes, ac_cv___attribute__=no)]) - if test "$ac_cv___attribute__" = "yes"; then - AC_DEFINE(HAVE___ATTRIBUTE__, 1, [Define to 1 if your compiler has __attribute__]) - fi - AC_MSG_RESULT($ac_cv___attribute__) -]) +AC_MSG_CHECKING([for __attribute__]) + +AC_CACHE_VAL([ac_cv___attribute__], + [AC_TRY_COMPILE( + [ +#include + ], + [ +int func(int x); +int foo(int x __attribute__ ((unused))) +{ + exit(1); +} + ], + [ac_cv___attribute__="yes"], + [ac_cv___attribute__="no"] + )] +) + +AC_MSG_RESULT($ac_cv___attribute__) + +if test "x${ac_cv___attribute__}" = "xyes" ; then + AC_DEFINE([HAVE___ATTRIBUTE__], [1], [Define to 1 if your compiler has __attribute__]) + AC_DEFINE([__UNUSED__], [__attribute__((unused))], [Macro declaring a function argument to be unused]) + else + AC_DEFINE([__UNUSED__], [], [Macro declaring a function argument to be unused]) +fi + +]) diff --git a/legacy/efreet/m4/ac_attribute.m4 b/legacy/efreet/m4/ac_attribute.m4 index 9e4b6b38e1..34bb4dbf2f 100644 --- a/legacy/efreet/m4/ac_attribute.m4 +++ b/legacy/efreet/m4/ac_attribute.m4 @@ -1,15 +1,46 @@ +dnl Copyright (C) 2004-2008 Kim Woelders +dnl Copyright (C) 2008 Vincent Torri +dnl That code is public domain and can be freely used or copied. +dnl Originally snatched from somewhere... + +dnl Macro for checking if the compiler supports __atribute__ + +dnl Usage: AC_C___ATTRIBUTE__ +dnl call AC_DEFINE for HAVE___ATTRIBUTE__ and __UNUSED__ +dnl if the compiler supports __attribute__, HAVE___ATTRIBUTE__ is +dnl defined to 1 and __UNUSED__ is defined to __attribute__((unused)) +dnl otherwise, HAVE___ATTRIBUTE__ is not defined and __UNUSED__ is +dnl defined to nothing. AC_DEFUN([AC_C___ATTRIBUTE__], [ - AC_MSG_CHECKING(for __attribute__) - AC_CACHE_VAL(ac_cv___attribute__, [ - AC_TRY_COMPILE([#include - int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }], - [], - ac_cv___attribute__=yes, ac_cv___attribute__=no)]) - if test "$ac_cv___attribute__" = "yes"; then - AC_DEFINE(HAVE___ATTRIBUTE__, 1, [Define to 1 if your compiler has __attribute__]) - fi - AC_MSG_RESULT($ac_cv___attribute__) -]) +AC_MSG_CHECKING([for __attribute__]) + +AC_CACHE_VAL([ac_cv___attribute__], + [AC_TRY_COMPILE( + [ +#include + ], + [ +int func(int x); +int foo(int x __attribute__ ((unused))) +{ + exit(1); +} + ], + [ac_cv___attribute__="yes"], + [ac_cv___attribute__="no"] + )] +) + +AC_MSG_RESULT($ac_cv___attribute__) + +if test "x${ac_cv___attribute__}" = "xyes" ; then + AC_DEFINE([HAVE___ATTRIBUTE__], [1], [Define to 1 if your compiler has __attribute__]) + AC_DEFINE([__UNUSED__], [__attribute__((unused))], [Macro declaring a function argument to be unused]) + else + AC_DEFINE([__UNUSED__], [], [Macro declaring a function argument to be unused]) +fi + +]) diff --git a/legacy/eina/src/include/eina_private.h b/legacy/eina/src/include/eina_private.h index 8216265540..ea266cc6ee 100644 --- a/legacy/eina/src/include/eina_private.h +++ b/legacy/eina/src/include/eina_private.h @@ -23,6 +23,12 @@ #include "eina_config.h" +#if HAVE___ATTRIBUTE__ +# define __UNUSED__ __attribute__((unused)) +#else +# define __UNUSED__ +#endif + #include "eina_magic.h" #include "eina_iterator.h" #include "eina_accessor.h" diff --git a/legacy/eina/src/include/eina_types.h b/legacy/eina/src/include/eina_types.h index 74eb61a38c..bfaa2e35f0 100644 --- a/legacy/eina/src/include/eina_types.h +++ b/legacy/eina/src/include/eina_types.h @@ -45,12 +45,6 @@ # endif #endif -#if HAVE___ATTRIBUTE__ -# define __UNUSED__ __attribute__((unused)) -#else -# define __UNUSED__ -#endif - /* remove this TRUE/FALSE redifinitions */ #ifndef TRUE diff --git a/legacy/evas/configure.ac b/legacy/evas/configure.ac index 06641f58ef..935c350b75 100644 --- a/legacy/evas/configure.ac +++ b/legacy/evas/configure.ac @@ -17,6 +17,7 @@ AM_PROG_CC_STDC AC_HEADER_STDC AC_C_BIGENDIAN AC_C_CONST +AC_C___ATTRIBUTE__ AC_LIBTOOL_WIN32_DLL define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl diff --git a/legacy/evas/m4/ac_attribute.m4 b/legacy/evas/m4/ac_attribute.m4 new file mode 100644 index 0000000000..34bb4dbf2f --- /dev/null +++ b/legacy/evas/m4/ac_attribute.m4 @@ -0,0 +1,46 @@ +dnl Copyright (C) 2004-2008 Kim Woelders +dnl Copyright (C) 2008 Vincent Torri +dnl That code is public domain and can be freely used or copied. +dnl Originally snatched from somewhere... + +dnl Macro for checking if the compiler supports __atribute__ + +dnl Usage: AC_C___ATTRIBUTE__ +dnl call AC_DEFINE for HAVE___ATTRIBUTE__ and __UNUSED__ +dnl if the compiler supports __attribute__, HAVE___ATTRIBUTE__ is +dnl defined to 1 and __UNUSED__ is defined to __attribute__((unused)) +dnl otherwise, HAVE___ATTRIBUTE__ is not defined and __UNUSED__ is +dnl defined to nothing. + +AC_DEFUN([AC_C___ATTRIBUTE__], +[ + +AC_MSG_CHECKING([for __attribute__]) + +AC_CACHE_VAL([ac_cv___attribute__], + [AC_TRY_COMPILE( + [ +#include + ], + [ +int func(int x); +int foo(int x __attribute__ ((unused))) +{ + exit(1); +} + ], + [ac_cv___attribute__="yes"], + [ac_cv___attribute__="no"] + )] +) + +AC_MSG_RESULT($ac_cv___attribute__) + +if test "x${ac_cv___attribute__}" = "xyes" ; then + AC_DEFINE([HAVE___ATTRIBUTE__], [1], [Define to 1 if your compiler has __attribute__]) + AC_DEFINE([__UNUSED__], [__attribute__((unused))], [Macro declaring a function argument to be unused]) + else + AC_DEFINE([__UNUSED__], [], [Macro declaring a function argument to be unused]) +fi + +])