diff options
| author | monty@hundin.mysql.fi <> | 2001-10-09 03:35:29 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-10-09 03:35:29 +0300 |
| commit | d5fe1db868a8786bad901a632631c2d94eadfbe6 (patch) | |
| tree | 07f2a0acc005ba2b7fb714ce60cb6f8417c6f60e /sql | |
| parent | 196f620e9024b12e33125c4be03c867b0fabbfcc (diff) | |
| download | mariadb-git-d5fe1db868a8786bad901a632631c2d94eadfbe6.tar.gz | |
One should not only have to include my_net.h to work with sockets.
This wrapper noew will include all the necessary, system specific files,
which makes all normal source files much easier to write and maintain.
Portability fixes.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/net_serv.cc | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index 44e3dd14f80..5e002a0f63e 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -31,16 +31,16 @@ #include <winsock.h> #endif #include <my_global.h> -#include "mysql_embed.h" +#include <mysql.h> +#include <mysql_embed.h> #include <mysql_com.h> -#include <violite.h> +#include <mysqld_error.h> #include <my_sys.h> #include <m_string.h> -#include "mysql.h" -#include "mysqld_error.h" +#include <my_net.h> +#include <violite.h> #include <signal.h> #include <errno.h> -#include <sys/types.h> #ifdef MYSQL_SERVER ulong max_allowed_packet=65536; @@ -60,20 +60,9 @@ ulong net_write_timeout= NET_WRITE_TIMEOUT; #endif ulong net_buffer_length=8192; /* Default length. Enlarged if necessary */ -#if !defined(__WIN__) && !defined(MSDOS) -#include <sys/socket.h> -#else +#if defined(__WIN__) || defined(MSDOS) #undef MYSQL_SERVER /* Win32 can't handle interrupts */ #endif -#if !defined(MSDOS) && !defined(__WIN__) && !defined(HAVE_BROKEN_NETINET_INCLUDES) && !defined(__BEOS__) -#include <netinet/in_systm.h> -#include <netinet/in.h> -#include <netinet/ip.h> -#if !defined(alpha_linux_port) -#include <netinet/tcp.h> -#endif -#endif -#include "mysqld_error.h" #ifdef MYSQL_SERVER #include "my_pthread.h" #include "thr_alarm.h" |