[svn-commits] qwell: branch qwell/pjsip-shared-libs r382293 - in /team/qwell/pjsip-shared-l...

[SVN commits to the Digium repositories]

Author: qwell
Date: Thu Feb 28 15:29:13 2013
New Revision: 382293

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

Merged revisions 382292 from http://svn.asterisk.org/svn/asterisk/trunk

Modified:
    team/qwell/pjsip-shared-libs/   (props changed)
    team/qwell/pjsip-shared-libs/include/asterisk.h
    team/qwell/pjsip-shared-libs/res/res_rtp_asterisk.c

Propchange: team/qwell/pjsip-shared-libs/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Feb 28 15:29:13 2013
@@ -1,1 +1,1 @@
-/trunk:1-382259
+/trunk:1-382292

Modified: team/qwell/pjsip-shared-libs/include/asterisk.h
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pjsip-shared-libs/include/asterisk.h?view=diff&rev=382293&r1=382292&r2=382293
==============================================================================
--- team/qwell/pjsip-shared-libs/include/asterisk.h (original)
+++ team/qwell/pjsip-shared-libs/include/asterisk.h Thu Feb 28 15:29:13 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: team/qwell/pjsip-shared-libs/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pjsip-shared-libs/res/res_rtp_asterisk.c?view=diff&rev=382293&r1=382292&r2=382293
==============================================================================
--- team/qwell/pjsip-shared-libs/res/res_rtp_asterisk.c (original)
+++ team/qwell/pjsip-shared-libs/res/res_rtp_asterisk.c Thu Feb 28 15:29:13 2013
@@ -48,10 +48,6 @@
 #endif
 
 #ifdef HAVE_PJPROJECT
-/* 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>