From: Tilghman Lesher Date: Tue, 7 Sep 2010 19:38:55 +0000 (+0000) Subject: Merged revisions 285336 via svnmerge from X-Git-Tag: 11.0.0-beta1~2367 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=875561fc2f5833451ed2ddb4fe40de860e760502;p=thirdparty%2Fasterisk.git 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. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@285337 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/addons/ooh323c/src/ooSocket.h b/addons/ooh323c/src/ooSocket.h index da3dcbf1c6..73492cc601 100644 --- a/addons/ooh323c/src/ooSocket.h +++ b/addons/ooh323c/src/ooSocket.h @@ -332,7 +332,7 @@ EXTERN int ooSocketSendTo(OOSOCKET socket, const ASN1OCTET* pdata, * 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); diff --git a/include/asterisk/compiler.h b/include/asterisk/compiler.h index b2db7ffdb3..91112dbfe9 100644 --- a/include/asterisk/compiler.h +++ b/include/asterisk/compiler.h @@ -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