diff options
| author | monty@hundin.mysql.fi <> | 2001-10-11 22:02:16 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-10-11 22:02:16 +0300 |
| commit | 6afbeb4cf4797f8843acf2ee3572476cea67cc73 (patch) | |
| tree | 6e9587de81599ae478e9d6deedc5fd8a0f4fd970 /libmysql | |
| parent | ac250625dc6030538c5c9ccb5907fc53b160f2db (diff) | |
| download | mariadb-git-6afbeb4cf4797f8843acf2ee3572476cea67cc73.tar.gz | |
Cleanups
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/manager.c | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/libmysql/manager.c b/libmysql/manager.c index 07595ab8dee..2f34f49209c 100644 --- a/libmysql/manager.c +++ b/libmysql/manager.c @@ -16,31 +16,30 @@ MA 02111-1307, USA */ #include <my_global.h> -#if defined(__WIN__) || defined(_WIN32) || defined(_WIN64) -#include <winsock.h> -#include <odbcinst.h> +#if defined(THREAD) +#include <my_pthread.h> /* because of signal() */ #endif +#include "mysql.h" +#include "mysql_version.h" +#include "mysqld_error.h" #include <my_sys.h> #include <mysys_err.h> #include <m_string.h> #include <m_ctype.h> -#include "mysql.h" -#include "mysql_version.h" -#include "mysqld_error.h" -#include "errmsg.h" +#include <my_net.h> +#include <errmsg.h> #include <violite.h> #include <sys/stat.h> #include <signal.h> -#include <time.h> #include <errno.h> -#ifdef HAVE_PWD_H -#include <pwd.h> +#if defined(OS2) +# include <sys/un.h> +#elif !defined( __WIN__) +#include <sys/resource.h> +#ifdef HAVE_SYS_UN_H +# include <sys/un.h> #endif -#if !defined(MSDOS) && !defined(__WIN__) -#include <sys/socket.h> -#include <netinet/in.h> -#include <arpa/inet.h> #include <netdb.h> #ifdef HAVE_SELECT_H # include <select.h> @@ -48,18 +47,13 @@ #ifdef HAVE_SYS_SELECT_H #include <sys/select.h> #endif -#endif -#ifdef HAVE_SYS_UN_H -# include <sys/un.h> -#endif -#if defined(THREAD) && !defined(__WIN__) -#include <my_pthread.h> /* because of signal() */ -#endif +#include <sys/utsname.h> +#endif /* __WIN__ */ + #ifndef INADDR_NONE #define INADDR_NONE -1 #endif - #define RES_BUF_SHIFT 5 #define SOCKET_ERROR -1 #define NET_BUF_SIZE 2048 |