← Back to branch summary

~brianaker/gearmand/734663

« back to all changes in this revision

Viewing changes to tests/test.c

  • Committer: Brian Aker
  • Date: 2011-02-15 01:48:22 UTC
  • mfrom: (373.1.5 gearmand-trunk)
  • Revision ID: brian@tangent.org-20110215014822-2rbjyk2a1stv4pev
Merge in bug fix for memcached, and various icc failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test.c
32
32
 
33
33
static long int timedif(struct timeval a, struct timeval b)
34
34
{
35
 
  register int us, s;
 
35
  long us, s;
36
36
 
37
 
  us = (int)(a.tv_usec - b.tv_usec);
 
37
  us = (long)(a.tv_usec - b.tv_usec);
38
38
  us /= 1000;
39
 
  s = (int)(a.tv_sec - b.tv_sec);
 
39
  s = (long)(a.tv_sec - b.tv_sec);
40
40
  s *= 1000;
41
41
  return s + us;
42
42
}