whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify use of __has_include in qlogging.cpp 

Easier to just #define it to 0

Change-Id: Ife99fdca6564077762fa67c6d7a5becaf48655d8
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
bb10
Thiago Macieira 2014-12-17 20:24:04 -08:00
parent 91ae988b5c
commit d1d3c36e87
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/corelib/global/qlogging.cpp
View File

@ -72,20 +72,17 @@
# include "private/qcore_unix_p.h"
#endif
#if !defined QT_NO_REGULAREXPRESSION && !defined(QT_BOOTSTRAPPED)
#ifdef __has_include
#if __has_include(<cxxabi.h>) && __has_include(<execinfo.h>)
#define QLOGGING_HAVE_BACKTRACE
#endif
#elif defined(__GLIBCXX__) && defined(__GLIBC__) // (because older version of gcc don't have __has_include)
#define QLOGGING_HAVE_BACKTRACE
#ifndef __has_include
# define __has_include(x) 0
#endif
#ifdef QLOGGING_HAVE_BACKTRACE
#include <qregularexpression.h>
#include <cxxabi.h>
#include <execinfo.h>
#endif
#if !defined QT_NO_REGULAREXPRESSION && !defined(QT_BOOTSTRAPPED)
# if (defined(__GLIBC__) && defined(__GLIBCXX__)) || (__has_include(<cxxabi.h>) && __has_include(<execinfo.h>))
# define QLOGGING_HAVE_BACKTRACE
# include <qregularexpression.h>
# include <cxxabi.h>
# include <execinfo.h>
# endif
#endif
#include <stdio.h>