diff options
| author | unknown <svoj@mysql.com> | 2005-06-08 21:40:58 +0500 |
|---|---|---|
| committer | unknown <svoj@mysql.com> | 2005-06-08 21:40:58 +0500 |
| commit | 226ecf1d6fa7511587464cacec23d971eb7268ea (patch) | |
| tree | 49369f45661b7eb8c831064a5ee7baf2e9162f54 /include | |
| parent | 2f7ee68d5c32fb23ca592d8f36682bbe87aa3ff8 (diff) | |
| parent | 59445ce472053bac4d96745e32d015fd4128cb61 (diff) | |
| download | mariadb-git-226ecf1d6fa7511587464cacec23d971eb7268ea.tar.gz | |
Merge mysql.com:/var/tmp/sslbug/mysql-4.0
into mysql.com:/var/tmp/sslbug/mysql-4.1
include/my_global.h:
Auto merged
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 |