summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2002-06-02 20:46:03 +0300
committermonty@hundin.mysql.fi <>2002-06-02 20:46:03 +0300
commit544f95c45112993df1d31d3eda859dd5e4efff89 (patch)
tree8de3d7e1875b8751450433ee53331ffb7322e7b5 /extra
parent44a631f1fc75abc897d606eb4c75e9898bff7e54 (diff)
parent5f93b1e46ac09a45524acb9803b8cd7f951599ef (diff)
downloadmariadb-git-544f95c45112993df1d31d3eda859dd5e4efff89.tar.gz
merge with 3.23
Diffstat (limited to 'extra')
-rw-r--r--extra/resolveip.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/resolveip.c b/extra/resolveip.c
index 6665ceebf1d..e380d920e9f 100644
--- a/extra/resolveip.c
+++ b/extra/resolveip.c
@@ -20,7 +20,6 @@
#include <my_global.h>
#include <m_ctype.h>
-#include <my_net.h>
#include <my_sys.h>
#include <m_string.h>
#include <sys/types.h>
@@ -30,6 +29,7 @@
#endif
#include <arpa/inet.h>
#include <netdb.h>
+#include <my_net.h>
#include <my_getopt.h>
#if !defined(_AIX) && !defined(HAVE_UNIXWARE7_THREADS) && !defined(HAVE_UNIXWARE7_POSIX) && !defined(h_errno)