diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2010-01-13 12:22:34 +0000 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2010-01-13 12:22:34 +0000 |
| commit | 46d1689b7c90c18a17dfcd71ef77c510c3ff122c (patch) | |
| tree | dddf2d3ec6941e3f9c47deefb52bcfa19ef6a23e /include | |
| parent | 231773b44919435b33696f77023ba81fd8a274c4 (diff) | |
| parent | 357496c091991d5f22f2b06429757415841fb76b (diff) | |
| download | mariadb-git-46d1689b7c90c18a17dfcd71ef77c510c3ff122c.tar.gz | |
merge mysql-next-mr --> mysql-5.1-rpl-merge
Conflicts:
Text conflict in sql/log.cc
Text conflict in sql/slave.cc
Text conflict in sql/sql_base.cc
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/config-win.h b/include/config-win.h index f8d51165bc2..5d64261076d 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -318,9 +318,12 @@ inline ulonglong double2ulonglong(double d) #define strcasecmp stricmp #define strncasecmp strnicmp -#define HAVE_SNPRINTF /* Gave link error */ +#define HAVE_SNPRINTF 1 #define snprintf _snprintf +#define HAVE_SETENV 1 +#define setenv(VAR,VAL,X) _putenv_s(VAR,VAL) + #ifdef _MSC_VER #define HAVE_LDIV /* The optimizer breaks in zortech for ldiv */ #define HAVE_ANSI_INCLUDE |