diff options
author | sergefp@mysql.com <> | 2004-08-24 14:44:15 +0400 |
---|---|---|
committer | sergefp@mysql.com <> | 2004-08-24 14:44:15 +0400 |
commit | d970586fefc1a5fc122a8e8bcee6f85a1aa2b284 (patch) | |
tree | 4fbc65a8bb604088b93c4781dc15692185dad66a /include | |
parent | a309f76128201fd8cce537048f2a0e2e6036fd7e (diff) | |
download | mariadb-git-d970586fefc1a5fc122a8e8bcee6f85a1aa2b284.tar.gz |
Fix to compile with msvc: converted static const int Item_arena::* to enum members, undefine ERROR
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 |