← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/array.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:
mysys/array.c
46
46
{
47
47
  if (!alloc_increment)
48
48
  {
49
 
    alloc_increment=max((8192-MALLOC_OVERHEAD)/element_size,16);
 
49
    alloc_increment=cmax((8192-MALLOC_OVERHEAD)/element_size,16);
50
50
    if (init_alloc > 8 && alloc_increment > init_alloc * 2)
51
51
      alloc_increment=init_alloc*2;
52
52
  }
338
338
 
339
339
void freeze_size(DYNAMIC_ARRAY *array)
340
340
{
341
 
  uint elements=max(array->elements,1);
 
341
  uint elements=cmax(array->elements,1);
342
342
 
343
343
  /*
344
344
    Do nothing if we are using a static buffer