← 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-13 17:17:50 UTC
  • mfrom: (2164.1.6 merge-vs-work)
  • mto: This revision was merged to the branch mainline in revision 2166.
  • Revision ID: mordred@inaugust.com-20110213171750-i4uhjnzp7sfdmdzp
Merged in code to make Windows build work again.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/drizzle.c
41
41
 
42
42
#include "libdrizzle/common.h"
43
43
 
44
 
 
45
44
/**
46
45
 * @addtogroup drizzle_static Static Drizzle Declarations
47
46
 * @ingroup drizzle
92
91
  WSADATA wsaData;
93
92
  if ( WSAStartup( MAKEWORD(2,2), &wsaData ) != 0 )
94
93
    printf("Error at WSAStartup()\n");
95
 
#endif
 
94
#else
96
95
  struct sigaction act;
97
96
  memset(&act, 0, sizeof(act));
98
97
 
99
98
  act.sa_handler = SIG_IGN;
100
99
  sigaction(SIGPIPE, &act, NULL);
 
100
#endif
101
101
 
102
102
  if (drizzle == NULL)
103
103
  {
426
426
 
427
427
  if (drizzle->pfds_size < drizzle->con_count)
428
428
  {
429
 
    pfds= realloc(drizzle->pfds, drizzle->con_count * sizeof(struct pollfd));
 
429
    pfds= (struct pollfd *)realloc(drizzle->pfds, drizzle->con_count * sizeof(struct pollfd));
430
430
    if (pfds == NULL)
431
431
    {
432
432
      drizzle_set_error(drizzle, "drizzle_con_wait", "realloc");