[asterisk-commits] mmichelson: branch 1.6.1 r162490 - in /branches/1.6.1: ./ include/asterisk/

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Dec  9 17:45:41 2008
New Revision: 162490

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

........
r162488 | kpfleming | 2008-12-09 17:41:02 -0600 (Tue, 09 Dec 2008) | 1 line

it does help if the compiler attribute syntax is correct
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/include/asterisk/stringfields.h

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

Modified: branches/1.6.1/include/asterisk/stringfields.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/include/asterisk/stringfields.h?view=diff&rev=162490&r1=162489&r2=162490
==============================================================================
--- branches/1.6.1/include/asterisk/stringfields.h (original)
+++ branches/1.6.1/include/asterisk/stringfields.h Tue Dec  9 17:45:41 2008
@@ -183,7 +183,7 @@
 */
 void __ast_string_field_ptr_build(struct ast_string_field_mgr *mgr,
 				  struct ast_string_field_pool **pool_head,
-				  const ast_string_field *ptr, const char *format, ...) __attribute((format(printf, 4, 5)));
+				  const ast_string_field *ptr, const char *format, ...) __attribute__((format(printf, 4, 5)));
 
 /*!
   \internal
@@ -198,7 +198,7 @@
 */
 void __ast_string_field_ptr_build_va(struct ast_string_field_mgr *mgr,
 				     struct ast_string_field_pool **pool_head,
-				     const ast_string_field *ptr, const char *format, va_list a1, va_list a2) __attribute((format(printf, 4, 0)));
+				     const ast_string_field *ptr, const char *format, va_list a1, va_list a2) __attribute__((format(printf, 4, 0)));
 
 /*!
   \brief Declare a string field