diff options
| author | unknown <svoj@mysql.com> | 2005-06-09 21:22:44 +0500 |
|---|---|---|
| committer | unknown <svoj@mysql.com> | 2005-06-09 21:22:44 +0500 |
| commit | f8f95d1c91bc1c39d2c9241f0781a7e7a45e8077 (patch) | |
| tree | 98e92fffada3a862d62a2447dde4d3a3deced4bc /include | |
| parent | db15e5c3918e5aa5dca5ef7e6688671349cf51ed (diff) | |
| parent | 226ecf1d6fa7511587464cacec23d971eb7268ea (diff) | |
| download | mariadb-git-f8f95d1c91bc1c39d2c9241f0781a7e7a45e8077.tar.gz | |
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/var/tmp/sslbug/mysql-4.1
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/my_global.h b/include/my_global.h index 523ecfba74d..f8ba555b150 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -264,13 +264,7 @@ C_MODE_START int __cxa_pure_virtual() {\ # endif #endif /* TIME_WITH_SYS_TIME */ #ifdef HAVE_UNISTD_H -#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) -#define crypt unistd_crypt -#endif #include <unistd.h> -#ifdef HAVE_OPENSSL -#undef crypt -#endif #endif #if defined(__cplusplus) && defined(NO_CPLUSPLUS_ALLOCA) #undef HAVE_ALLOCA |