diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-12-12 21:01:32 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-12-12 21:01:32 +0200 |
| commit | e6783a8785925f0e7433cd96d8f7f8b5c6d0c9a0 (patch) | |
| tree | 60ab7f5c2863b09ca19f3f9cda800c3ac4eb3bdd /innobase/include | |
| parent | 25c8f58ac7710db353a1078f22988cdaa5633817 (diff) | |
| download | mariadb-git-e6783a8785925f0e7433cd96d8f7f8b5c6d0c9a0.tar.gz | |
Removed compiler warnings
Fixed wrong variable name for Windows
VC++Files/innobase/innobase.dsp:
Don't use precompiled headers (doesn't work with samba)
VC++Files/myisammrg/myisammrg.dsp:
Add missing files
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
Fixed included paths
VC++Files/mysqldemb/mysqldemb.dsp:
Don't use precompiled headers (doesn't work with samba)
VC++Files/mysqlserver/mysqlserver.dsp:
Don't use precompiled headers (doesn't work with samba)
VC++Files/sql/mysqld.dsp:
Fixed paths
innobase/include/univ.i:
Removed compiler warning
myisammrg/myrg_open.c:
Removed compiler warning
sql/ha_myisam.cc:
Removed compiler warning
Fixed wrong (but not dangerous) if statement
sql/ha_myisammrg.cc:
Removed compiler warning
sql/mysqld.cc:
Fixed wrong variable name for Windows
sql/sql_update.cc:
Removed not used label
Diffstat (limited to 'innobase/include')
| -rw-r--r-- | innobase/include/univ.i | 3 |
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> |