aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2008-05-04 02:09:44 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2008-05-04 02:09:44 +0000
commit8e65ea9bd92da2a7ae784128210bb3d6b3535038 (patch)
tree7eaf38585085a6565360f63debec7f6105977f56
parent7d87871baafe0dbf42c71eebbb449aac6fde730d (diff)
Expand the test function for GCC attributes so that more complex attributes are properly recognized.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@115282 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--acinclude.m42
-rwxr-xr-xconfigure12
2 files changed, 7 insertions, 7 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index b4df57451..0fa4e546e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -6,7 +6,7 @@ AC_MSG_CHECKING(for compiler 'attribute $1' support)
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Werror"
AC_COMPILE_IFELSE(
- AC_LANG_PROGRAM([static int __attribute__(($1)) test(void) {}],
+ AC_LANG_PROGRAM([static void __attribute__(($1)) *test(void *muffin, ...) {}],
[]),
AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED([HAVE_ATTRIBUTE_$1], 1, [Define to 1 if your GCC C compiler supports the '$1' attribute.]),
diff --git a/configure b/configure
index c9479e0ce..86b2c57be 100755
--- a/configure
+++ b/configure
@@ -14900,7 +14900,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-static int __attribute__((pure)) test(void) {}
+static void __attribute__((pure)) *test(void *muffin, ...) {}
int
main ()
{
@@ -14956,7 +14956,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-static int __attribute__((malloc)) test(void) {}
+static void __attribute__((malloc)) *test(void *muffin, ...) {}
int
main ()
{
@@ -15012,7 +15012,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-static int __attribute__((const)) test(void) {}
+static void __attribute__((const)) *test(void *muffin, ...) {}
int
main ()
{
@@ -15068,7 +15068,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-static int __attribute__((unused)) test(void) {}
+static void __attribute__((unused)) *test(void *muffin, ...) {}
int
main ()
{
@@ -15124,7 +15124,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-static int __attribute__((always_inline)) test(void) {}
+static void __attribute__((always_inline)) *test(void *muffin, ...) {}
int
main ()
{
@@ -15180,7 +15180,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-static int __attribute__((deprecated)) test(void) {}
+static void __attribute__((deprecated)) *test(void *muffin, ...) {}
int
main ()
{