summaryrefslogtreecommitdiff
path: root/innobase
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2002-12-12 21:01:32 +0200
committermonty@mashka.mysql.fi <>2002-12-12 21:01:32 +0200
commit62dfd57475826002b8fa1bed24d563363a1faf84 (patch)
tree60ab7f5c2863b09ca19f3f9cda800c3ac4eb3bdd /innobase
parent8a46cc3868d15edb8992f384b0790fc6a98672eb (diff)
downloadmariadb-git-62dfd57475826002b8fa1bed24d563363a1faf84.tar.gz
Removed compiler warnings
Fixed wrong variable name for Windows
Diffstat (limited to 'innobase')
-rw-r--r--innobase/include/univ.i3
1 files changed, 2 insertions, 1 deletions
diff --git a/innobase/include/univ.i b/innobase/include/univ.i
index f32161fed20..43130549eae 100644
--- a/innobase/include/univ.i
+++ b/innobase/include/univ.i
@@ -9,7 +9,8 @@ Created 1/20/1994 Heikki Tuuri
#ifndef univ_i
#define univ_i
-#if (defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)) && !defined(MYSQL_SERVER)
+#if (defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)) && !defined(MYSQL_SERVER) && !defined(__WIN__)
+#undef __WIN__
#define __WIN__
#include <windows.h>