diff --git a/include/asterisk.h b/include/asterisk.h index a25f291e50..e99bdeefd6 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 4450a51b5f..05ebf0ae8f 100644 --- a/res/res_rtp_asterisk.c +++ b/res/res_rtp_asterisk.c @@ -46,10 +46,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include #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"