summaryrefslogtreecommitdiff
path: root/extra/resolveip.c
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-05-27 23:52:21 +0300
committerunknown <monty@hundin.mysql.fi>2002-05-27 23:52:21 +0300
commit766038f27750b0243a6147c9aaa97b2d8dea114f (patch)
treece0149ca9ce44752aec0e31495476c57b4047278 /extra/resolveip.c
parent37db9f71bae8f09a3ca99ce1438aa4131756efd8 (diff)
parent940a8a4020442f0d19d0137a8a847429af3f8a05 (diff)
downloadmariadb-git-766038f27750b0243a6147c9aaa97b2d8dea114f.tar.gz
merge with 3.23.51
BitKeeper/etc/logging_ok: auto-union BUILD/SETUP.sh: Auto merged Docs/manual.texi: Auto merged extra/resolveip.c: Auto merged include/my_sys.h: Auto merged mysql-test/t/type_enum.test: Auto merged mysys/mf_strip.c: Auto merged mysys/raid.cc: Auto merged include/my_net.h: merge mysql-test/r/type_enum.result: merge mysql-test/t/type_decimal.test: merge mysys/Makefile.am: merge sql/sql_db.cc: merge sql/sql_parse.cc: merge
Diffstat (limited to 'extra/resolveip.c')
-rw-r--r--extra/resolveip.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/extra/resolveip.c b/extra/resolveip.c
index 8c2c264ea2e..f4b703bec4f 100644
--- a/extra/resolveip.c
+++ b/extra/resolveip.c
@@ -32,11 +32,6 @@
#include <netdb.h>
#include <my_getopt.h>
-#ifdef SCO
-#undef h_errno
-#define h_errno errno
-#endif
-
#if !defined(_AIX) && !defined(HAVE_UNIXWARE7_THREADS) && !defined(HAVE_UNIXWARE7_POSIX) && !defined(h_errno)
extern int h_errno;
#endif