Commit 226ecf1d authored by unknown's avatar unknown
Browse files

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

into mysql.com:/var/tmp/sslbug/mysql-4.1


include/my_global.h:
  Auto merged
parents 2f7ee68d 59445ce4

include/my_global.h

+0 −6
Original line number Diff line number Diff line
@@ -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