← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mf_getdate.cc

Merged in latest plugin-slot-reorg.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/mf_getdate.cc
15
15
 
16
16
/* Get date in a printable form: yyyy-mm-dd hh:mm:ss */
17
17
 
18
 
#include "mysys_priv.h"
 
18
#include "mysys/mysys_priv.h"
19
19
#include <mystrings/m_string.h>
 
20
#include <stdio.h>
20
21
 
21
22
/*
22
23
  get date as string
42
43
  struct tm tm_tmp;
43
44
#endif
44
45
 
45
 
   skr=date ? (time_t) date : my_time(0);
 
46
   skr= date ? (time_t) date : time(0);
46
47
#if defined(HAVE_LOCALTIME_R) && defined(_REENTRANT)
47
48
   if (flag & GETDATE_GMT)
48
49
     localtime_r(&skr,&tm_tmp);