← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/oldlibdrizzle/viosocket.cc

  • Committer: Nathan Williams
  • Date: 2009-07-02 06:54:37 UTC
  • mfrom: (1085 staging)
  • mto: This revision was merged to the branch mainline in revision 1087.
  • Revision ID: nathanlws@gmail.com-20090702065437-nmgxvuk837rpa3e0
Merged trunk, resolved conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/oldlibdrizzle/viosocket.cc
33
33
 
34
34
#include <netdb.h>
35
35
 
 
36
#include <algorithm>
 
37
 
 
38
using namespace std;
 
39
 
36
40
int drizzleclient_vio_errno(Vio *vio)
37
41
{
38
42
  (void)vio;
64
68
 
65
69
  if (vio->read_pos < vio->read_end)
66
70
  {
67
 
    rc= cmin((size_t) (vio->read_end - vio->read_pos), size);
 
71
    rc= min((size_t) (vio->read_end - vio->read_pos), size);
68
72
    memcpy(buf, vio->read_pos, rc);
69
73
    vio->read_pos+= rc;
70
74
    /*