Skip to content

Commit 1e21c5a

Browse files
committed
fix backtrace output
1 parent e5a4557 commit 1e21c5a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/app/main.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ typedef SInt32 SRefCon;
8787
#include "qgsrectangle.h"
8888
#include "qgslogger.h"
8989

90-
#if (defined(linux) && !defined(ANDROID)) || defined(__FreeBSD__)
90+
#if ((defined(linux) || defined(__linux__)) && !defined(ANDROID)) || defined(__FreeBSD__)
9191
#include <unistd.h>
9292
#include <execinfo.h>
9393
#include <signal.h>
@@ -175,7 +175,7 @@ static void dumpBacktrace( unsigned int depth )
175175
if ( depth == 0 )
176176
depth = 20;
177177

178-
#if (defined(linux) && !defined(ANDROID)) || defined(__FreeBSD__)
178+
#if ((defined(linux) || defined(__linux__)) && !defined(ANDROID)) || defined(__FreeBSD__)
179179
int stderr_fd = -1;
180180
if ( access( "/usr/bin/c++filt", X_OK ) < 0 )
181181
{
@@ -234,7 +234,7 @@ static void dumpBacktrace( unsigned int depth )
234234
void **buffer = new void *[ depth ];
235235

236236
SymSetOptions( SYMOPT_DEFERRED_LOADS | SYMOPT_INCLUDE_32BIT_MODULES | SYMOPT_UNDNAME );
237-
SymInitialize( GetCurrentProcess(), "http://msdl.microsoft.com/download/symbols", TRUE );
237+
SymInitialize( GetCurrentProcess(), "http://msdl.microsoft.com/download/symbols;http://download.osgeo.org/osgeo4w/symstore", TRUE );
238238

239239
unsigned short nFrames = CaptureStackBackTrace( 1, depth, buffer, NULL );
240240
SYMBOL_INFO *symbol = ( SYMBOL_INFO * ) qgsMalloc( sizeof( SYMBOL_INFO ) + 256 );

0 commit comments

Comments
 (0)