[asterisk-commits] tilghman: trunk r285337 - in /trunk: ./ addons/ooh323c/src/ include/asterisk/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Sep  7 14:38:55 2010
New Revision: 285337

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=285337
Log:
Merged revisions 285336 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r285336 | tilghman | 2010-09-07 14:38:12 -0500 (Tue, 07 Sep 2010) | 2 lines
  
  Fix build on FreeBSD 8.0, take 2.
........

Modified:
    trunk/   (props changed)
    trunk/addons/ooh323c/src/ooSocket.h
    trunk/include/asterisk/compiler.h

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/addons/ooh323c/src/ooSocket.h
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/ooh323c/src/ooSocket.h?view=diff&rev=285337&r1=285336&r2=285337
==============================================================================
--- trunk/addons/ooh323c/src/ooSocket.h (original)
+++ trunk/addons/ooh323c/src/ooSocket.h Tue Sep  7 14:38:55 2010
@@ -332,7 +332,7 @@
  *                     negative return value is error.
  */
 EXTERN int ooSocketSelect(int nfds, fd_set *readfds, fd_set *writefds, 
-                            fd_set *exceptfds, struct timeval * timeout) __attribute_deprecated__;
+                            fd_set *exceptfds, struct timeval * timeout) attribute_deprecated;
 
 EXTERN int ooSocketPoll(struct pollfd *pfds, int nfds, int timeout);
 

Modified: trunk/include/asterisk/compiler.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/compiler.h?view=diff&rev=285337&r1=285336&r2=285337
==============================================================================
--- trunk/include/asterisk/compiler.h (original)
+++ trunk/include/asterisk/compiler.h Tue Sep  7 14:38:55 2010
@@ -41,6 +41,12 @@
 #define attribute_const
 #endif
 
+#ifdef HAVE_ATTRIBUTE_deprecated
+#define attribute_deprecated __attribute__((deprecated))
+#else
+#define attribute_deprecated
+#endif
+
 #ifdef HAVE_ATTRIBUTE_unused
 #define attribute_unused __attribute__((unused))
 #else