diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-02 19:02:28 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-02 19:02:28 -0300 |
| commit | a52a4bc16ae86e449da229b20c4321e264bf2f0c (patch) | |
| tree | bb1b133a543d25a8c8e65ec0230a13f9f070992d | |
| parent | 5641fb64b4719774f6c4ba4c1ec85fa5312c5ecf (diff) | |
| parent | 0300935ff3f6b422cff4c383d74ce0124dfd7f1f (diff) | |
| download | mariadb-git-a52a4bc16ae86e449da229b20c4321e264bf2f0c.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
| -rw-r--r-- | include/m_string.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/m_string.h b/include/m_string.h index c3dcf19e73d..2e443a87736 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -61,6 +61,10 @@ # define bfill(A,B,C) memset((A),(C),(B)) #endif +#if !defined(bzero) && !defined(HAVE_BZERO) +# define bzero(A,B) memset((A),0,(B)) +#endif + #if defined(__cplusplus) extern "C" { #endif @@ -104,10 +108,6 @@ extern char NEAR _dig_vec_lower[]; extern void bfill(uchar *dst,size_t len,pchar fill); #endif -#if !defined(bzero) && !defined(HAVE_BZERO) -extern void bzero(uchar * dst,size_t len); -#endif - #ifndef bmove512 extern void bmove512(uchar *dst,const uchar *src,size_t len); #endif |