diff options
| author | unknown <sergefp@mysql.com> | 2004-08-24 14:44:15 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2004-08-24 14:44:15 +0400 |
| commit | d261072f7cdb44869ab8de39fd7a67f0c5122ab5 (patch) | |
| tree | 4fbc65a8bb604088b93c4781dc15692185dad66a /include | |
| parent | 1ffda90b83273cc46869444fc6e7d3c2ebd7f62a (diff) | |
| download | mariadb-git-d261072f7cdb44869ab8de39fd7a67f0c5122ab5.tar.gz | |
Fix to compile with msvc: converted static const int Item_arena::* to enum members, undefine ERROR
include/config-win.h:
Undefine ERROR #defined by WINGDI
sql/sql_class.cc:
Fix to compile with msvc: converted static const int Item_arena::* to enum members
sql/sql_class.h:
Fix to compile with msvc: converted static const int Item_arena::* to enum members
sql/sql_prepare.cc:
Fix to compile with msvc: converted static const int Item_arena::* to enum members
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/config-win.h b/include/config-win.h index 91697c985d1..96a155633eb 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -150,6 +150,11 @@ typedef uint rf_SetTimer; #define HAVE_NAMED_PIPE /* We can only create pipes on NT */ #endif +/* ERROR is defined in wingdi.h */ +#ifdef ERROR +#undef ERROR +#endif + /* We need to close files to break connections on shutdown */ #ifndef SIGNAL_WITH_VIO_CLOSE #define SIGNAL_WITH_VIO_CLOSE |