[svn-commits] tilghman: branch 1.6.0 r115107 - in /branches/1.6.0: ./ include/asterisk/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu May  1 18:22:02 2008
New Revision: 115107

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

................
r115104 | tilghman | 2008-05-01 18:21:13 -0500 (Thu, 01 May 2008) | 10 lines

Merged revisions 115102 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r115102 | tilghman | 2008-05-01 18:20:25 -0500 (Thu, 01 May 2008) | 2 lines

Change the comment of deprecated to an actual compiler deprecation

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/include/asterisk/res_odbc.h

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

Modified: branches/1.6.0/include/asterisk/res_odbc.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/res_odbc.h?view=diff&rev=115107&r1=115106&r2=115107
==============================================================================
--- branches/1.6.0/include/asterisk/res_odbc.h (original)
+++ branches/1.6.0/include/asterisk/res_odbc.h Thu May  1 18:22:02 2008
@@ -64,7 +64,7 @@
  * This function really only ever worked with MySQL, where the statement handle is
  * not prepared on the server.  If you are not using MySQL, you should avoid it.
  */
-int ast_odbc_smart_execute(struct odbc_obj *obj, SQLHSTMT stmt); /* DEPRECATED */
+int ast_odbc_smart_execute(struct odbc_obj *obj, SQLHSTMT stmt) __attribute__ ((deprecated));
 
 /*! 
  * \brief Retrieves a connected ODBC object