diff options
| author | unknown <reggie@big_geek.> | 2006-05-24 12:43:03 -0500 |
|---|---|---|
| committer | unknown <reggie@big_geek.> | 2006-05-24 12:43:03 -0500 |
| commit | c38308dee2caf5eccea688ea907a3fe68bec7d17 (patch) | |
| tree | af9751119a8093c02864b8e095e7ab41cf95e1cd /sql/net_serv.cc | |
| parent | ca4340e68be3f33890093b4498b708ca4314d526 (diff) | |
| download | mariadb-git-c38308dee2caf5eccea688ea907a3fe68bec7d17.tar.gz | |
some small fixups
include/config-win.h:
force time_t to be 32 bit on Visual C++ 2005 or later
sql/net_serv.cc:
include winsock after my_global so the time_t #define can take effect
storage/csv/ha_tina.cc:
fix the csv engine so that it supports DOS, Unix, and Mac line endings
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index 6763196ec37..03164827e8f 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -37,9 +37,6 @@ HFTODO this must be hidden if we don't want client capabilities in embedded library */ -#ifdef __WIN__ -#include <winsock.h> -#endif #include <my_global.h> #include <mysql.h> #include <mysql_embed.h> @@ -51,7 +48,9 @@ #include <violite.h> #include <signal.h> #include <errno.h> - +#ifdef __WIN__ +#include <winsock.h> +#endif #ifdef __NETWARE__ #include <sys/select.h> #endif |