Skip to content

M
mariadb
Commit a3e72ec8 authored by svoj@mysql.com's avatar svoj@mysql.com
Browse files
Options

Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/var/tmp/sslbug/mysql-4.1
parents cb7961bd f9751e17
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
include/my_global.h
View file @ a3e72ec8
...@@ -264,13 +264,7 @@ C_MODE_START int __cxa_pure_virtual() {\ ...@@ -264,13 +264,7 @@ C_MODE_START int __cxa_pure_virtual() {\
# endif # endif
#endif /* TIME_WITH_SYS_TIME */ #endif /* TIME_WITH_SYS_TIME */
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__)
#define crypt unistd_crypt
#endif
#include <unistd.h> #include <unistd.h>
#ifdef HAVE_OPENSSL
#undef crypt
#endif
#endif #endif
#if defined(__cplusplus) && defined(NO_CPLUSPLUS_ALLOCA) #if defined(__cplusplus) && defined(NO_CPLUSPLUS_ALLOCA)
#undef HAVE_ALLOCA #undef HAVE_ALLOCA
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7