← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/drizzle.h

  • Committer: Monty Taylor
  • Date: 2011-02-12 19:46:19 UTC
  • mto: (2165.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 2166.
  • Revision ID: mordred@inaugust.com-20110212194619-bpk3oxfno3of3tdj
Merged in various amounts of win32 fixes. Now is quite happy in vs10.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/drizzle.h
47
47
#include <sys/types.h>
48
48
 
49
49
#ifdef _WIN32
 
50
# define WIN32_LEAN_AND_MEAN
 
51
# include <Windows.h>
50
52
# include <winsock2.h>
51
53
# include <ws2tcpip.h>
52
54
 
62
64
  char sun_path[108];
63
65
};
64
66
 
 
67
# define poll WSAPoll
 
68
//# define pollfd WSAPOLLFD
 
69
 
65
70
#if defined(__GNUC__)
66
71
# include <stdbool.h>
67
72
#else
78
83
# include <arpa/inet.h>
79
84
# include <sys/un.h>
80
85
# include <netdb.h>
 
86
# include <poll.h>
81
87
#endif
82
88
 
83
89
#include <assert.h>
84
90
#include <errno.h>
85
 
#include <poll.h>
86
91
 
87
92
#include <libdrizzle/visibility.h>
88
93
#include <libdrizzle/constants.h>