[svn-commits] file: branch 1.6.0 r115284 - in /branches/1.6.0: ./ acinclude.m4 configure

[SVN commits to the Digium repositories]

Author: file
Date: Sat May  3 21:12:12 2008
New Revision: 115284

URL: http://svn.digium.com/view/asterisk?view=rev&rev=115284
Log:
Merged revisions 115283 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r115283 | file | 2008-05-03 23:11:01 -0300 (Sat, 03 May 2008) | 10 lines

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.

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/acinclude.m4
    branches/1.6.0/configure

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/acinclude.m4
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/acinclude.m4?view=diff&rev=115284&r1=115283&r2=115284
==============================================================================
--- branches/1.6.0/acinclude.m4 (original)
+++ branches/1.6.0/acinclude.m4 Sat May  3 21:12:12 2008
@@ -10,7 +10,7 @@
 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.]),