[svn-commits] qwell: trunk r382292 - in /trunk: include/asterisk.h res/res_rtp_asterisk.c

[SVN commits to the Digium repositories]

Author: qwell
Date: Thu Feb 28 15:21:50 2013
New Revision: 382292

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=382292
Log:
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/

Modified:
    trunk/include/asterisk.h
    trunk/res/res_rtp_asterisk.c

Modified: trunk/include/asterisk.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk.h?view=diff&rev=382292&r1=382291&r2=382292
==============================================================================
--- trunk/include/asterisk.h (original)
+++ trunk/include/asterisk.h Thu Feb 28 15:21:50 2013
@@ -213,17 +213,6 @@
 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)

Modified: trunk/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_rtp_asterisk.c?view=diff&rev=382292&r1=382291&r2=382292
==============================================================================
--- trunk/res/res_rtp_asterisk.c (original)
+++ trunk/res/res_rtp_asterisk.c Thu Feb 28 15:21:50 2013
@@ -46,10 +46,6 @@
 #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"