diff options
author | Joshua Colp <jcolp@digium.com> | 2008-05-04 02:11:01 +0000 |
---|---|---|
committer | Joshua Colp <jcolp@digium.com> | 2008-05-04 02:11:01 +0000 |
commit | b8dae12c06cc1f16fcac221f4a6ade0a25d87710 (patch) | |
tree | d72ebdeff55c556c5a7d5bd1c975fa1f3a9b06bb | |
parent | 9aeffd14cb728be0a57e863de839287eaed80c90 (diff) |
Merged revisions 115282 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r115282 | file | 2008-05-03 23:09:44 -0300 (Sat, 03 May 2008) | 2 lines
Expand the test function for GCC attributes so that more complex attributes are properly recognized.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@115283 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | acinclude.m4 | 2 | ||||
-rwxr-xr-x | configure | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index e5f24fc57..139524140 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -10,7 +10,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.]), @@ -16561,7 +16561,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 () { @@ -16617,7 +16617,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 () { @@ -16673,7 +16673,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 () { @@ -16729,7 +16729,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 () { @@ -16785,7 +16785,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 () { @@ -16841,7 +16841,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 () { @@ -16897,7 +16897,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -static int __attribute__((sentinel)) test(void) {} +static void __attribute__((sentinel)) *test(void *muffin, ...) {} int main () { |