diff options
author | unknown <monty@hundin.mysql.fi> | 2001-10-08 23:06:53 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2001-10-08 23:06:53 +0300 |
commit | 151ffe886b4b21499471658fdf01ea8347287092 (patch) | |
tree | 55514ef9d9476f69934416b453f6a4caed3a08a9 /sql | |
parent | 63c7276f365c4f00168d75e3a1d63bb959df1dc1 (diff) | |
download | mariadb-git-151ffe886b4b21499471658fdf01ea8347287092.tar.gz |
merge sql/violite.c with libmysql/violite.c
libmysql/violite.c:
cleanup
sql/violite.c:
merge with libmysql/violite.c
(These files 'should' be symlinked but..)
Diffstat (limited to 'sql')
-rw-r--r-- | sql/violite.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/violite.c b/sql/violite.c index d551b9b8632..721e6c8d81c 100644 --- a/sql/violite.c +++ b/sql/violite.c @@ -39,6 +39,13 @@ #include <sys/ioctl.h> #endif +#if !defined(MSDOS) && !defined(__WIN__) && !defined(HAVE_BROKEN_NETINET_INCLUDES) && !defined(__BEOS__) +#include <netinet/ip.h> +#if !defined(alpha_linux_port) +#include <netinet/tcp.h> +#endif +#endif + #if defined(__EMX__) || defined(OS2) #define ioctlsocket ioctl #endif /* defined(__EMX__) */ |