summaryrefslogtreecommitdiff
path: root/libmysql/get_password.c
diff options
context:
space:
mode:
authorunknown <brian@zim.(none)>2006-04-15 18:17:32 -0700
committerunknown <brian@zim.(none)>2006-04-15 18:17:32 -0700
commitcc62983ca2be9fe0559d3f5a326bb7284c08c4cb (patch)
tree4deb7a54227f30d8a5d4b647405eb100c0f8ab28 /libmysql/get_password.c
parentf42b90fcb8d4625336fabc13e899b7510bebec80 (diff)
downloadmariadb-git-cc62983ca2be9fe0559d3f5a326bb7284c08c4cb.tar.gz
Final patch to remove the last of the OS2 support.
client/client_priv.h: OS2 removal client/mysql.cc: OS2 removal dbug/dbug.c: OS2 removal include/m_string.h: OS2 removal include/my_global.h: Cleanup for have_mit libmysql/dll.c: OS2 removal libmysql/get_password.c: OS2 removal libmysql/libmysql.c: OS2 removal libmysql/manager.c: OS2 removal sql-common/client.c: OS2 removal sql/event_executor.cc: OS2 removal sql/hostname.cc: OS2 removal sql/log.cc: OS2 removal sql/log_event.h: OS2 removal sql/my_lock.c: OS2 removal sql/mysql_priv.h: OS2 removal sql/mysqld.cc: OS2 removal sql/net_serv.cc: OS2 removal sql/repl_failsafe.cc: OS2 removal sql/slave.cc: OS2 removal sql/sql_base.cc: OS2 removal sql/sql_insert.cc: OS2 removal sql/sql_load.cc: OS2 removal sql/sql_parse.cc: OS2 removal sql/sql_table.cc: OS2 removal storage/myisam/myisamchk.c: OS2 removal storage/ndb/src/mgmclient/main.cpp: OS2 removal storage/ndb/src/mgmsrv/main.cpp: OS2 removal vio/vio.c: OS2 removal vio/viosocket.c: OS2 removal vio/viossl.c: OS2 removal
Diffstat (limited to 'libmysql/get_password.c')
-rw-r--r--libmysql/get_password.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysql/get_password.c b/libmysql/get_password.c
index e55e77320f0..a48cb6d7a6e 100644
--- a/libmysql/get_password.c
+++ b/libmysql/get_password.c
@@ -36,7 +36,7 @@
#include <pwd.h>
#endif /* HAVE_PWD_H */
#else /* ! HAVE_GETPASS */
-#if !defined(__WIN__) && !defined(OS2) && !defined(__NETWARE__)
+#if !defined(__WIN__) && !defined(__NETWARE__)
#include <sys/ioctl.h>
#ifdef HAVE_TERMIOS_H /* For tty-password */
#include <termios.h>
@@ -65,7 +65,7 @@
#define getpass(A) getpassphrase(A)
#endif
-#if defined( __WIN__) || defined(OS2) || defined(__NETWARE__)
+#if defined( __WIN__) || defined(__NETWARE__)
/* were just going to fake it here and get input from the keyboard */
#ifdef __NETWARE__