← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/stacktrace.cc

  • Committer: Nathan Williams
  • Date: 2009-06-25 00:01:26 UTC
  • mto: This revision was merged to the branch mainline in revision 1082.
  • Revision ID: nathanlws@gmail.com-20090625000126-fv99nqpec4edrchc
Converted last usage of cmin to std::min.

Removed cmin and cmax defines from global.h

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/stacktrace.cc
31
31
#include <execinfo.h>
32
32
#endif
33
33
 
 
34
#include <algorithm>
 
35
 
 
36
using namespace std;
 
37
 
34
38
#define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end)
35
39
 
36
40
char *heap_start;
147
151
 
148
152
  if (!stack_bottom || (unsigned char*) stack_bottom > (unsigned char*) &fp)
149
153
  {
150
 
    ulong tmp= cmin(0x10000,thread_stack);
 
154
    ulong tmp= min((size_t)0x10000,thread_stack);
151
155
    /* Assume that the stack starts at the previous even 65K */
152
156
    stack_bottom= (unsigned char*) (((ulong) &fp + tmp) &
153
157
                          ~(ulong) 0xFFFF);