diff options
| author | unknown <svoj@mysql.com> | 2005-06-08 21:07:25 +0500 |
|---|---|---|
| committer | unknown <svoj@mysql.com> | 2005-06-08 21:07:25 +0500 |
| commit | 59445ce472053bac4d96745e32d015fd4128cb61 (patch) | |
| tree | 24125eada4c3f2d63f93ded92abf54751e61c1aa | |
| parent | 93722fded286965225f729a7ad84e16402d7b1bb (diff) | |
| download | mariadb-git-59445ce472053bac4d96745e32d015fd4128cb61.tar.gz | |
Fix for
BUG#10675 - MySQL fails to build with --openssl on Mac OS X 10.4
BUG#11150 - HP-UX yaSSL/OpenSSL configure/header problem
Remove obsolete code.
include/my_global.h:
Obsolete code removed. OpenSSL doesn't have crypt anymore (it was dropped in ~2003).
This patch fixes compilation failures with both OpenSSL and yaSSL on systems where
crypt was defined in unistd.h.
Conclusion is we do not use OpenSSL's crypt unless it wasn't defined in
unistd.h/crypt.h and it was defined in old OpenSSL.
| -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 f24bcd528ca..e2a97667a1f 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -248,13 +248,7 @@ C_MODE_END # 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 |