← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_time.c

  • Committer: Monty Taylor
  • Date: 2008-09-22 23:53:43 UTC
  • mto: This revision was merged to the branch mainline in revision 417.
  • Revision ID: monty@inaugust.com-20080922235343-ihqvp6g9k1mtzxmc
Renamed max/min.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/my_time.c
244
244
    2003-03-03 20:00:20 AM
245
245
    20:00:20.000000 AM 03-03-2000
246
246
  */
247
 
  i= max((uint) format_position[0], (uint) format_position[1]);
 
247
  i= cmax((uint) format_position[0], (uint) format_position[1]);
248
248
  set_if_bigger(i, (uint) format_position[2]);
249
249
  allow_space= ((1 << i) | (1 << format_position[6]));
250
250
  allow_space&= (1 | 2 | 4 | 8);