diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-09 15:06:21 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-09 15:06:21 +0000 |
| commit | 67c6e3c37dabf65fb77a9c1f89f69550dfc319f7 (patch) | |
| tree | 867b49816ced0aa9f069da445b711c4f12978b74 /include | |
| parent | 51619435a4ed586a1d35d60acdfee494112c59d2 (diff) | |
Merged revisions 147807 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r147807 | murf | 2008-10-09 08:17:33 -0600 (Thu, 09 Oct 2008) | 15 lines
(closes issue #13557)
Reported by: nickpeirson
Patches:
pbx.c.patch uploaded by nickpeirson (license 579)
replace_bzero+bcopy.patch uploaded by nickpeirson (license 579)
Tested by: nickpeirson, murf
1. replaced all refs to bzero and bcopy to memset and memmove instead.
2. added a note to the CODING-GUIDELINES
3. add two macros to asterisk.h to prevent bzero, bcopy from creeping
back into the source
4. removed bzero from configure, configure.ac, autoconfig.h.in
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@147811 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk.h | 3 | ||||
| -rw-r--r-- | include/asterisk/autoconfig.h.in | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/asterisk.h b/include/asterisk.h index f55d5bb0d..7ae81136b 100644 --- a/include/asterisk.h +++ b/include/asterisk.h @@ -178,4 +178,7 @@ struct ast_module; struct ast_variable; struct ast_str; +#define bzero 0x__dont_use_bzero__use_memset_instead"" +#define bcopy 0x__dont_use_bcopy__use_memmove_instead() + #endif /* _ASTERISK_H */ diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index cff934563..717232ee8 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -126,9 +126,6 @@ /* Define to 1 if byteswap.h macros are available. */ #undef HAVE_BYTESWAP_H -/* Define to 1 if you have the `bzero' function. */ -#undef HAVE_BZERO - /* Define this to indicate the ${CAP_DESCRIP} library */ #undef HAVE_CAP |