kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't undefine bzero()/bcopy().

Browse Source 
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
This commit is contained in:
Jason Parker
2013-02-28 21:21:50 +00:00
parent 1a34b465bc
commit 6acc9ceb76
2 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/asterisk.h
View File

@@ -213,17 +213,6 @@ struct ast_variable;
struct ast_str; struct ast_str;
struct ast_sched_context; 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 */ /* Some handy macros for turning a preprocessor token into (effectively) a quoted string */
#define __stringify_1(x) #x #define __stringify_1(x) #x
#define __stringify(x) __stringify_1(x) #define __stringify(x) __stringify_1(x)

4
res/res_rtp_asterisk.c
View File

@@ -46,10 +46,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <openssl/bio.h> #include <openssl/bio.h>
#endif #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.h"
#include "pjlib-util.h" #include "pjlib-util.h"
#include "pjnath.h" #include "pjnath.h"