summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKonstantin Osipov <kostja@sun.com>2010-02-03 17:10:36 +0300
committerKonstantin Osipov <kostja@sun.com>2010-02-03 17:10:36 +0300
commitf74c9dd04daae26a6c528729d0de90ba62dc9068 (patch)
tree35d57972d218fde29acc34b05b90339ebaa0d3cb /include
parentc8555bdb35d998e99b6fb568f03c63479ff9272d (diff)
parent51caeae915d3a5add57a785e69b7ce52cac084ad (diff)
downloadmariadb-git-f74c9dd04daae26a6c528729d0de90ba62dc9068.tar.gz
Merge next-mr -> next-4284.
Diffstat (limited to 'include')
-rw-r--r--include/config-win.h5
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