← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzleclient/viosocket.c

  • Committer: Jay Pipes
  • Date: 2009-02-04 15:44:25 UTC
  • mfrom: (829 drizzle)
  • mto: This revision was merged to the branch mainline in revision 830.
  • Revision ID: jpipes@serialcoder-20090204154425-th8xfk2ujz2y8xwg
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzleclient/viosocket.c
22
22
 
23
23
#define DONT_MAP_VIO
24
24
#include <drizzled/global.h>
25
 
#include <libdrizzle/vio.h>
 
25
#include "vio.h"
 
26
#include <drizzled/util/test.h>
 
27
 
26
28
#include <sys/socket.h>
27
 
#include <drizzled/util/test.h>
28
29
#include <string.h>
29
30
 
30
31
#include <netinet/tcp.h>
298
299
  error= setsockopt(vio->sd, SOL_SOCKET, is_sndtimeo ? SO_SNDTIMEO : SO_RCVTIMEO,
299
300
                    &wait_timeout,
300
301
                    (socklen_t)sizeof(struct timeval));
301
 
  if (error != 0)
 
302
  if (error == -1 && errno != ENOPROTOOPT)
302
303
  {
303
304
    perror("setsockopt");
304
305
    assert(error == 0);