diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-11-21 19:13:14 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-11-21 19:13:14 +0200 |
| commit | a8d03ab23519d4afc288a6490676ddb8745e3e72 (patch) | |
| tree | e55f53ff3cc4b044769ca269561a933e3c93f05f /include/m_string.h | |
| parent | 04f3ecf632816a940e2838949e0216d638436fd8 (diff) | |
| parent | 13fefeb04ade34418cd9d99aa93bffb69fdae27e (diff) | |
| download | mariadb-git-a8d03ab23519d4afc288a6490676ddb8745e3e72.tar.gz | |
Initail merge with MySQL 5.1 (XtraDB still needs to be merged)
Fixed up copyright messages.
Diffstat (limited to 'include/m_string.h')
| -rw-r--r-- | include/m_string.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/include/m_string.h b/include/m_string.h index ebed8b8ba1f..ea818e9ad9e 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2000 MySQL AB +/* + Copyright (c) 2000, 2011, Oracle and/or its affiliates. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -11,7 +12,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ /* There may be prolems include all of theese. Try to test in configure with ones are needed? */ @@ -56,14 +58,16 @@ /* Unixware 7 */ #if !defined(HAVE_BFILL) # define bfill(A,B,C) memset((A),(C),(B)) -# define bmove_align(A,B,C) memcpy((A),(B),(C)) #endif +# define bmove_align(A,B,C) memcpy((A),(B),(C)) + #if !defined(HAVE_BCMP) -# 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)) +#endif + +#if !defined(bzero) && (!defined(HAVE_BZERO) || !defined(HAVE_DECL_BZERO)) +# define bzero(A,B) memset((A),0,(B)) #endif #if defined(__cplusplus) |