← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/drizzle_protocol/viosocket.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/drizzle_protocol/viosocket.cc
21
21
*/
22
22
 
23
23
#define DONT_MAP_VIO
24
 
#include <drizzled/global.h>
 
24
#include "config.h"
25
25
#include "vio.h"
26
26
#include <drizzled/util/test.h>
27
27
 
28
28
#include <sys/socket.h>
29
 
#include <string.h>
 
29
#include <fcntl.h>
30
30
 
 
31
#include <sys/types.h>
31
32
#include <netinet/tcp.h>
32
33
#include <netinet/in.h>
33
34
#include <sys/poll.h>
 
35
#include <unistd.h>
34
36
 
35
37
#include <netdb.h>
36
38
 
 
39
#include <cstdio>
 
40
#include <cstring>
 
41
#include <cassert>
 
42
 
37
43
#include <algorithm>
38
44
 
39
45
using namespace std;