Merge mysql.com:/var/tmp/sslbug/mysql-4.0

into mysql.com:/var/tmp/sslbug/mysql-4.1 include/my_global.h: Auto merged

Merge mysql.com:/var/tmp/sslbug/mysql-4.0
into mysql.com:/var/tmp/sslbug/mysql-4.1 include/my_global.h: Auto merged
6720bb2d · unknown · 70a55799 · 72793e7b · 6720bb2d
Commit 6720bb2d authored Jun 08, 2005 by unknown
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
@@ -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