diff options
| author | Jason Parker <jparker@digium.com> | 2013-02-28 21:21:50 +0000 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2013-02-28 21:21:50 +0000 |
| commit | 6acc9ceb7621d47a78f7e0c69bfad6ed27e8bac2 (patch) | |
| tree | 6ffcca1da8a2ffe3e9fbab0da76b8a6c04e664c3 | |
| parent | 1a34b465bc98e40afc7118f9f63e4f9839e5c908 (diff) | |
Don't undefine bzero()/bcopy().
This was causing build failures against external libraries that happened to use
them, unless silly hacks were added to the modules that used those headers.
Review: https://reviewboard.asterisk.org/r/2359/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@382292 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | include/asterisk.h | 11 | ||||
| -rw-r--r-- | res/res_rtp_asterisk.c | 4 |
2 files changed, 0 insertions, 15 deletions
diff --git a/include/asterisk.h b/include/asterisk.h index a25f291e5..e99bdeefd 100644 --- a/include/asterisk.h +++ b/include/asterisk.h @@ -213,17 +213,6 @@ struct ast_variable; struct ast_str; struct ast_sched_context; -#ifdef bzero -#undef bzero -#endif - -#ifdef bcopy -#undef bcopy -#endif - -#define bzero 0x__dont_use_bzero__use_memset_instead"" -#define bcopy 0x__dont_use_bcopy__use_memmove_instead() - /* Some handy macros for turning a preprocessor token into (effectively) a quoted string */ #define __stringify_1(x) #x #define __stringify(x) __stringify_1(x) diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c index 4450a51b5..05ebf0ae8 100644 --- a/res/res_rtp_asterisk.c +++ b/res/res_rtp_asterisk.c @@ -46,10 +46,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <openssl/bio.h> #endif -/* Asterisk discourages the use of bzero in favor of memset, in fact if you try to use bzero it will tell you to use memset. As a result bzero has to be undefined - * here since it is used internally by pjlib. The only other option would be to modify pjlib... which won't happen. */ -#undef bzero -#define bzero bzero #include "pjlib.h" #include "pjlib-util.h" #include "pjnath.h" |