Changeset 20900

Show
Ignore:
Timestamp:
11/07/07 17:06:50 (1 year ago)
Author:
patrick
Message:

MF22 r20899: Be sure not to use the stack crawling code to Mac OS X when

getbacktrace(3) is available. This fixes build errors on
Leopard.

Submitted by: Doug McCorkle? <mccdo at iastate dot edu>

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/trunk/modules/vapor/vpr/SystemBase.cpp

    r20774 r20900  
    6969#endif 
    7070 
     71 
    7172#if (! defined(__INTEL_COMPILER) && defined(__GNUC__) && \ 
    7273     ((__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3)) || \ 
    …… 
    222223   std::string::size_type start(std::string::npos), end(std::string::npos); 
    223224 
    224 #if defined(VPR_OS_Darwin) 
     225#if defined(VPR_OS_Darwin) && ! defined(HAVE_BACKTRACE) 
    225226   end = trace_line.find(":F("); 
    226227 
    …… 
    248249   { 
    249250      std::string::size_type assign_start, assign_end; 
    250 #if defined(VPR_OS_Darwin) 
     251#if defined(VPR_OS_Darwin) && ! defined(HAVE_BACKTRACE) 
    251252      assign_start = start; 
    252253      assign_end   = end; 
    …… 
    262263      if(0==status) 
    263264      { 
    264 #if defined(VPR_OS_Darwin) 
     265#if defined(VPR_OS_Darwin) && ! defined(HAVE_BACKTRACE) 
    265266         trace_line = demangled_buf; 
    266267#else 
    …… 
    296297} 
    297298 
    298 #if defined(VPR_OS_Darwin) 
     299#if defined(VPR_OS_Darwin) && ! defined(HAVE_BACKTRACE) 
    299300struct CrawlFrame 
    300301{