diff options
| author | monty@mysql.com <> | 2004-08-31 16:53:25 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-08-31 16:53:25 +0300 |
| commit | 7abae83300e2d75ea2a077fee1349915cb366967 (patch) | |
| tree | 517681f3f24bff198f452f95eba935119c9c701d /include | |
| parent | e022b3144e3adb9c12fcfb73110070abbef3e863 (diff) | |
| parent | 6adaff23a4b2170f59dda27cd5b897adb40c2542 (diff) | |
| download | mariadb-git-7abae83300e2d75ea2a077fee1349915cb366967.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/config-win.h b/include/config-win.h index 96a155633eb..0ba8dd2cf43 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -151,9 +151,7 @@ typedef uint rf_SetTimer; #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 |