~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzleslap.cc

  • Committer: Lee Bieber
  • Date: 2011-03-29 22:31:41 UTC
  • mfrom: (2257.1.3 build)
  • Revision ID: kalebral@gmail.com-20110329223141-yxc22h3l2he58sk0
Merge Andrew - 743842: Build failure using GCC 4.6
Merge Stewart - 738022: CachedDirectory silently fails to add entries if stat() fails
Merge Olaf - Common fwd: add copyright, add more declaration

Show diffs side-by-side

added added

removed removed

Lines of Context:
71
71
 
72
72
*/
73
73
 
74
 
#include "config.h"
 
74
#include <config.h>
75
75
#include "client_priv.h"
76
76
 
77
77
#include "option_string.h"
245
245
 
246
246
static long int timedif(struct timeval a, struct timeval b)
247
247
{
248
 
  register int us, s;
 
248
  int us, s;
249
249
 
250
250
  us = a.tv_usec - b.tv_usec;
251
251
  us /= 1000;