diff options
author | unknown <monty@work.mysql.com> | 2001-04-19 00:58:30 +0200 |
---|---|---|
committer | unknown <monty@work.mysql.com> | 2001-04-19 00:58:30 +0200 |
commit | 7337a193b1bb590c127daa9d92839e476e9b219f (patch) | |
tree | 7492d30d693c0862c24d2824ac91384a71a3c5e9 /include | |
parent | c778d3374cdaa5760ce41d9febe070266055a6f0 (diff) | |
parent | 09518126f1d05214b2e6518825d819cc86138f1f (diff) | |
download | mariadb-git-7337a193b1bb590c127daa9d92839e476e9b219f.tar.gz |
Merge
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
client/mysql.cc:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/sql_select.cc:
Auto merged
Docs/manual.texi:
SCCS merged
sql/Makefile.am:
SCCS merged
Diffstat (limited to 'include')
-rw-r--r-- | include/global.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/global.h b/include/global.h index 2ad4a1387a9..2c9157630f4 100644 --- a/include/global.h +++ b/include/global.h @@ -28,6 +28,19 @@ #include <os2.h> #endif /* __EMX__ */ +#ifdef __CYGWIN__ +/* We use a Unix API, so pretend it's not Windows */ +#undef WIN +#undef WIN32 +#undef _WIN +#undef _WIN32 +#undef _WIN64 +#undef __WIN__ +#undef __WIN32__ +#define HAVE_ERRNO_AS_DEFINE +#endif /* __CYGWIN__ */ + + #if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32) #include <config-win.h> #else |