← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_alloc.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/my_alloc.c
186
186
  {                                             /* Time to alloc new block */
187
187
    block_size= mem_root->block_size * (mem_root->block_num >> 2);
188
188
    get_size= length+ALIGN_SIZE(sizeof(USED_MEM));
189
 
    get_size= max(get_size, block_size);
 
189
    get_size= cmax(get_size, block_size);
190
190
 
191
191
    if (!(next = (USED_MEM*) my_malloc(get_size,MYF(MY_WME | ME_FATALERROR))))
192
192
    {