From: Jason Parker <jparker@digium.com>
Date: Thu, 28 Feb 2013 21:21:50 +0000 (+0000)
Subject: Don't undefine bzero()/bcopy().
X-Git-Tag: 13.0.0-beta1~2052
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6acc9ceb7621d47a78f7e0c69bfad6ed27e8bac2;p=thirdparty%2Fasterisk.git

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
---

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 <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"