summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Juyung Seo <juyung.seo@samsung.com>2014-01-06 23:45:47 +0900
committerDaniel Juyung Seo <juyung.seo@samsung.com>2014-01-06 23:45:47 +0900
commit465da71acf4eb5fcec512df38b8e0e526a014659 (patch)
tree9c2747a33a872fd9e2c49015b7891987db81f198
parent3f6cff6f98bf41a8df9b6f83bade24af2d75f482 (diff)
elm: Removed the use of __UNUSED__ from elementary.
Use EINA_UNUSED instead.
-rw-r--r--configure.ac1
-rw-r--r--doc/Doxyfile.in2
-rw-r--r--m4/ac_attribute.m447
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
45AC_PROG_CC_STDC 45AC_PROG_CC_STDC
46AC_HEADER_STDC 46AC_HEADER_STDC
47AC_C_CONST 47AC_C_CONST
48AC_C___ATTRIBUTE__
49AC_FUNC_ALLOCA 48AC_FUNC_ALLOCA
50 49
51# pkg-config 50# 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
121SEARCH_INCLUDES = NO 121SEARCH_INCLUDES = NO
122INCLUDE_PATH = 122INCLUDE_PATH =
123INCLUDE_FILE_PATTERNS = 123INCLUDE_FILE_PATTERNS =
124PREDEFINED = __UNUSED__= EINA_ARG_NONNULL()= EINA_MALLOC= EINA_WARN_UNUSED_RESULT= EAPI= 124PREDEFINED = EINA_ARG_NONNULL()= EINA_MALLOC= EINA_WARN_UNUSED_RESULT= EAPI=
125EXPAND_AS_DEFINED = 125EXPAND_AS_DEFINED =
126SKIP_FUNCTION_MACROS = YES 126SKIP_FUNCTION_MACROS = YES
127TAGFILES = 127TAGFILES =
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 @@
1dnl Copyright (C) 2004-2008 Kim Woelders
2dnl Copyright (C) 2008 Vincent Torri <vtorri at univ-evry dot fr>
3dnl That code is public domain and can be freely used or copied.
4dnl Originally snatched from somewhere...
5
6dnl Macro for checking if the compiler supports __attribute__
7
8dnl Usage: AC_C___ATTRIBUTE__
9dnl call AC_DEFINE for HAVE___ATTRIBUTE__ and __UNUSED__
10dnl if the compiler supports __attribute__, HAVE___ATTRIBUTE__ is
11dnl defined to 1 and __UNUSED__ is defined to __attribute__((unused))
12dnl otherwise, HAVE___ATTRIBUTE__ is not defined and __UNUSED__ is
13dnl defined to nothing.
14
15AC_DEFUN([AC_C___ATTRIBUTE__],
16[
17
18AC_MSG_CHECKING([for __attribute__])
19
20AC_CACHE_VAL([ac_cv___attribute__],
21 [AC_TRY_COMPILE(
22 [
23#include <stdlib.h>
24
25int func(int x);
26int foo(int x __attribute__ ((unused)))
27{
28 exit(1);
29}
30 ],
31 [],
32 [ac_cv___attribute__="yes"],
33 [ac_cv___attribute__="no"]
34 )])
35
36AC_MSG_RESULT($ac_cv___attribute__)
37
38if test "x${ac_cv___attribute__}" = "xyes" ; then
39 AC_DEFINE([HAVE___ATTRIBUTE__], [1], [Define to 1 if your compiler has __attribute__])
40 AC_DEFINE([__UNUSED__], [__attribute__((unused))], [Macro declaring a function argument to be unused])
41 else
42 AC_DEFINE([__UNUSED__], [], [Macro declaring a function argument to be unused])
43fi
44
45])
46
47dnl End of ac_attribute.m4