diff options
author | Daniel Juyung Seo <juyung.seo@samsung.com> | 2014-01-06 23:45:47 +0900 |
---|---|---|
committer | Daniel Juyung Seo <juyung.seo@samsung.com> | 2014-01-06 23:45:47 +0900 |
commit | 465da71acf4eb5fcec512df38b8e0e526a014659 (patch) | |
tree | 9c2747a33a872fd9e2c49015b7891987db81f198 | |
parent | 3f6cff6f98bf41a8df9b6f83bade24af2d75f482 (diff) | |
download | elementary-465da71acf4eb5fcec512df38b8e0e526a014659.tar.gz |
elm: Removed the use of __UNUSED__ from elementary.
Use EINA_UNUSED instead.
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | doc/Doxyfile.in | 2 | ||||
-rw-r--r-- | m4/ac_attribute.m4 | 47 |
3 files changed, 1 insertions, 49 deletions
diff --git a/configure.ac b/configure.ac index 14ac06db2..7f14077d9 100644 --- a/configure.ac +++ b/configure.ac @@ -45,7 +45,6 @@ AC_PROG_CC AC_PROG_CC_STDC AC_HEADER_STDC AC_C_CONST -AC_C___ATTRIBUTE__ AC_FUNC_ALLOCA # pkg-config diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 0c1a44196..704bfb631 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -121,7 +121,7 @@ EXPAND_ONLY_PREDEF = YES SEARCH_INCLUDES = NO INCLUDE_PATH = INCLUDE_FILE_PATTERNS = -PREDEFINED = __UNUSED__= EINA_ARG_NONNULL()= EINA_MALLOC= EINA_WARN_UNUSED_RESULT= EAPI= +PREDEFINED = EINA_ARG_NONNULL()= EINA_MALLOC= EINA_WARN_UNUSED_RESULT= EAPI= EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES TAGFILES = diff --git a/m4/ac_attribute.m4 b/m4/ac_attribute.m4 deleted file mode 100644 index 23479a92a..000000000 --- a/m4/ac_attribute.m4 +++ /dev/null @@ -1,47 +0,0 @@ -dnl Copyright (C) 2004-2008 Kim Woelders -dnl Copyright (C) 2008 Vincent Torri <vtorri at univ-evry dot fr> -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 __attribute__ - -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 <stdlib.h> - -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 - -]) - -dnl End of ac_attribute.m4 |