diff options
| author | unknown <lars/lthalmann@dl145j.mysql.com> | 2007-05-31 10:23:37 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145j.mysql.com> | 2007-05-31 10:23:37 +0200 |
| commit | f527c0c9dd78955747f993a01b9839efc9d29a5d (patch) | |
| tree | c67e68ad0df11e935a15e49bbe01d12fac5eab8e /include/config-win.h | |
| parent | 0e78deec27a53c72e28f828ef42a5629e40d4d34 (diff) | |
| parent | fec3d7c6aea43070d85bae207f45da02c186db70 (diff) | |
| download | mariadb-git-f527c0c9dd78955747f993a01b9839efc9d29a5d.tar.gz | |
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
include/config-win.h:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'include/config-win.h')
| -rw-r--r-- | include/config-win.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/config-win.h b/include/config-win.h index db5f516a59b..4b8913c8f5d 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -350,7 +350,10 @@ inline double ulonglong2double(ulonglong value) #define SPRINTF_RETURNS_INT #define HAVE_SETFILEPOINTER #define HAVE_VIO_READ_BUFF +#if defined(_MSC_VER) && _MSC_VER >= 1400 +/* strnlen() appeared in Studio 2005 */ #define HAVE_STRNLEN +#endif #define HAVE_WINSOCK2 #define strcasecmp stricmp |