diff --git a/mysys/my_init.c b/mysys/my_init.c index a7899c20442..fc178b0308b 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -19,10 +19,6 @@ #include "mysys_err.h" #include #include -#ifdef HAVE_GETRUSAGE -#include -/* extern int getrusage(int, struct rusage *); */ -#endif #include #ifdef VMS #include diff --git a/mysys/mysys_priv.h b/mysys/mysys_priv.h index f79431a0b0b..6abadd48aeb 100644 --- a/mysys/mysys_priv.h +++ b/mysys/mysys_priv.h @@ -21,6 +21,10 @@ #include "system_wrappers.h" #endif +#ifdef HAVE_GETRUSAGE +#include +#endif + #ifdef THREAD #include extern pthread_mutex_t THR_LOCK_malloc, THR_LOCK_open, THR_LOCK_keycache; @@ -29,3 +33,4 @@ extern pthread_mutex_t THR_LOCK_charset; #else #include #endif + diff --git a/sql/hostname.cc b/sql/hostname.cc index c9cb2a43963..c74d230bbcb 100644 --- a/sql/hostname.cc +++ b/sql/hostname.cc @@ -27,9 +27,6 @@ extern "C" { // Because of SCO 3.2V4.2 #endif #if !defined( __WIN__) && !defined(OS2) -#if !defined(__NETWARE__) -#include -#endif /* __NETWARE__ */ #ifdef HAVE_SYS_UN_H #include #endif