diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-01 21:07:48 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-01 21:07:48 +0000 |
| commit | cbfb7ff54e7310ef77f106297b01f86304bc815e (patch) | |
| tree | ef30b47dcdcd3bbaa4d29d3fa83b1fe8f6db3f4b | |
| parent | 8ac7c1c09c647adf2e81d86e2215fbcf76045583 (diff) | |
Merged revisions 154919 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r154919 | seanbright | 2008-11-05 17:01:22 -0500 (Wed, 05 Nov 2008) | 2 lines
Fix a problem found while building res_snmp.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@160096 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | include/asterisk.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asterisk.h b/include/asterisk.h index eed328e9d..d83cc3dda 100644 --- a/include/asterisk.h +++ b/include/asterisk.h @@ -176,6 +176,14 @@ struct ast_module; struct ast_variable; struct ast_str; +#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() |