diff options
author | monty@mashka.mysql.fi <> | 2003-04-28 10:34:34 +0300 |
---|---|---|
committer | monty@mashka.mysql.fi <> | 2003-04-28 10:34:34 +0300 |
commit | dea3a3a88eec18749f36d8c52f6ad341bd564da8 (patch) | |
tree | f5a5cb41809426800de8bef77a8ea069566cb2cc /include | |
parent | eda45900864f4eaccf7d0392eb3a0ed095e16d5b (diff) | |
parent | 51eed4b48cbe41d226bef548fb900306e4edb650 (diff) | |
download | mariadb-git-dea3a3a88eec18749f36d8c52f6ad341bd564da8.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
Diffstat (limited to 'include')
-rw-r--r-- | include/my_global.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index e12a7d7273b..b979cd5955a 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -267,6 +267,10 @@ C_MODE_END #include <asm/atomic.h> #endif #include <errno.h> /* Recommended by debian */ +/* We need the following to go around a problem with openssl on solaris */ +#if defined(HAVE_CRYPT) +#include <crypt.h> +#endif /* Go around some bugs in different OS and compilers */ #if defined(_HPUX_SOURCE) && defined(HAVE_SYS_STREAM_H) |