← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to vio/viosocket.c

  • Committer: Monty Taylor
  • Date: 2008-10-02 01:31:53 UTC
  • mfrom: (398.1.6 codestyle-new)
  • Revision ID: monty@inaugust.com-20081002013153-b097om921cd3j1pn
Merged from stdint-includes-fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
vio/viosocket.c
53
53
 
54
54
  if (vio->read_pos < vio->read_end)
55
55
  {
56
 
    rc= min((size_t) (vio->read_end - vio->read_pos), size);
 
56
    rc= cmin((size_t) (vio->read_end - vio->read_pos), size);
57
57
    memcpy(buf, vio->read_pos, rc);
58
58
    vio->read_pos+= rc;
59
59
    /*