summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgluh@gluh.mysql.r18.ru <>2003-05-30 18:41:19 +0500
committergluh@gluh.mysql.r18.ru <>2003-05-30 18:41:19 +0500
commit3317cfdc7d756a54d53712ede7e68fcd98a71ade (patch)
treed468e99c496be1dd9c0f2d1b68d734679ed914f7
parent450f168bd4a74ab9cd16813895416f07dbb4c3f6 (diff)
downloadmariadb-git-3317cfdc7d756a54d53712ede7e68fcd98a71ade.tar.gz
Fix for compiling MySQL-4.0.13 with SSL support on OpenBSD
-rw-r--r--include/my_global.h2
-rw-r--r--sql/mysql_priv.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h
index ca24c21c688..d892d843edc 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -246,7 +246,7 @@ C_MODE_END
# endif
#endif /* TIME_WITH_SYS_TIME */
#ifdef HAVE_UNISTD_H
-#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT)
+#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__)
#define crypt unistd_crypt
#endif
#include <unistd.h>
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 614cb8cadf6..b191a702efe 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -458,6 +458,7 @@ Field *find_field_in_tables(THD *thd,Item_field *item,TABLE_LIST *tables);
Field *find_field_in_table(THD *thd,TABLE *table,const char *name,uint length,
bool check_grant,bool allow_rowid);
#ifdef HAVE_OPENSSL
+#include <openssl/des.h>
struct st_des_keyblock
{
des_cblock key1, key2, key3;