diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-07 19:38:55 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-07 19:38:55 +0000 |
commit | 7b30444d8040f5eba390b48cb76edf9b8706c194 (patch) | |
tree | 3c04b8323b79fb4c88af4b356cbe62ea1acecfaf | |
parent | 9dcd3bed163070a571fc010093539d2720a4c4a3 (diff) |
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: http://svn.digium.com/svn/asterisk/trunk@285337 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | addons/ooh323c/src/ooSocket.h | 2 | ||||
-rw-r--r-- | include/asterisk/compiler.h | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/addons/ooh323c/src/ooSocket.h b/addons/ooh323c/src/ooSocket.h index da3dcbf1c..73492cc60 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 b2db7ffdb..91112dbfe 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 |