← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/drizzle.c

  • 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.c
92
92
  WSADATA wsaData;
93
93
  if ( WSAStartup( MAKEWORD(2,2), &wsaData ) != 0 )
94
94
    printf("Error at WSAStartup()\n");
95
 
#endif
 
95
#else
96
96
  struct sigaction act;
97
97
  memset(&act, 0, sizeof(act));
98
98
 
99
99
  act.sa_handler = SIG_IGN;
100
100
  sigaction(SIGPIPE, &act, NULL);
 
101
#endif
101
102
 
102
103
  if (drizzle == NULL)
103
104
  {
426
427
 
427
428
  if (drizzle->pfds_size < drizzle->con_count)
428
429
  {
429
 
    pfds= realloc(drizzle->pfds, drizzle->con_count * sizeof(struct pollfd));
 
430
    pfds= (pollfd *)realloc(drizzle->pfds, drizzle->con_count * sizeof(pollfd));
430
431
    if (pfds == NULL)
431
432
    {
432
433
      drizzle_set_error(drizzle, "drizzle_con_wait", "realloc");