diff options
| author | unknown <jimw@mysql.com> | 2005-06-09 18:00:47 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-06-09 18:00:47 -0700 |
| commit | 967256ebd7d3214092535217f41cff0d7a7f6e60 (patch) | |
| tree | e0121da6d4d89acb4a84e8c7df896268e7ac67a5 /include | |
| parent | 9fc802086618c6ad9ed5fa8bbd395c0ee5a9ea31 (diff) | |
| parent | f8f95d1c91bc1c39d2c9241f0781a7e7a45e8077 (diff) | |
| download | mariadb-git-967256ebd7d3214092535217f41cff0d7a7f6e60.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/r/ps_6bdb.result:
Auto merged
include/my_global.h:
SCCS 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 195d208c93b..04d33be38b4 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -285,13 +285,7 @@ C_MODE_END # endif #endif /* TIME_WITH_SYS_TIME */ #ifdef HAVE_UNISTD_H -#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) && !defined(__APPLE__) -#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 |