Merge mysql.com:/home/jimw/my/mysql-4.1-clean

into mysql.com:/home/jimw/my/mysql-5.0-clean

Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
a5285b14 · jimw@mysql.com · 12a7b7af · a3e72ec8 · a5285b14
Commit a5285b14 authored Jun 09, 2005 by jimw@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

include/my_global.h include/my_global.h +0 -6

No files found.
--- 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