diff options
| author | jani@a88-113-38-195.elisa-laajakaista.fi <> | 2008-02-08 12:13:33 +0100 |
|---|---|---|
| committer | jani@a88-113-38-195.elisa-laajakaista.fi <> | 2008-02-08 12:13:33 +0100 |
| commit | 4f98f3e683afe4f524219b0640ce18896e278ab8 (patch) | |
| tree | 84b77e8521fa1d155d7a44ba441199c0c89d547a /include/m_string.h | |
| parent | ccd53222d61d25ae2702d87a3b617a1f835eedc7 (diff) | |
| parent | 707e899c9e7b1b135a394809937588f5c57047a3 (diff) | |
| download | mariadb-git-4f98f3e683afe4f524219b0640ce18896e278ab8.tar.gz | |
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
Diffstat (limited to 'include/m_string.h')
| -rw-r--r-- | include/m_string.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/m_string.h b/include/m_string.h index 9d2a30917bd..c24bfd7aa6c 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -67,7 +67,7 @@ # define bcopy(s, d, n) memcpy((d), (s), (n)) # define bcmp(A,B,C) memcmp((A),(B),(C)) # define bzero(A,B) memset((A),0,(B)) -# define bmove_align(A,B,C) memcpy((A),(B),(C)) +# define bmove_align(A,B,C) memcpy((A),(B),(C)) #endif #if defined(__cplusplus) @@ -129,7 +129,10 @@ extern size_t bcmp(const uchar *s1,const uchar *s2,size_t len); extern size_t my_bcmp(const uchar *s1,const uchar *s2,size_t len); #undef bcmp #define bcmp(A,B,C) my_bcmp((A),(B),(C)) -#endif +#define bzero_if_purify(A,B) bzero(A,B) +#else +#define bzero_if_purify(A,B) +#endif /* HAVE_purify */ #ifndef bmove512 extern void bmove512(uchar *dst,const uchar *src,size_t len); |