diff options
| author | Kent Boortz <kent.boortz@oracle.com> | 2011-07-03 17:47:37 +0200 |
|---|---|---|
| committer | Kent Boortz <kent.boortz@oracle.com> | 2011-07-03 17:47:37 +0200 |
| commit | b6e6097c95eee4f453c117c298ee6a03fdcd499d (patch) | |
| tree | 448d397ed328f719a29a8fbbd54df8d943ed7274 /include/m_string.h | |
| parent | 1400d7a2cc33fd158efcb3bd638c4ee4c8762207 (diff) | |
| parent | 8e14d52610d747977bcbe2875cbe7d93724d8143 (diff) | |
| download | mariadb-git-b6e6097c95eee4f453c117c298ee6a03fdcd499d.tar.gz | |
Updated/added copyright headers
Diffstat (limited to 'include/m_string.h')
| -rw-r--r-- | include/m_string.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/m_string.h b/include/m_string.h index 2f5137cfa17..0e0090f52e6 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. 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 @@ -60,7 +60,7 @@ # define bfill(A,B,C) memset((A),(C),(B)) #endif -#if !defined(bzero) && !defined(HAVE_BZERO) +#if !defined(bzero) && (!defined(HAVE_BZERO) || !defined(HAVE_DECL_BZERO)) # define bzero(A,B) memset((A),0,(B)) #endif |