Skip to content

Commit 4b66a71

Browse files
committed
fix:1.10.25, 修改backtrace.cpp,摒弃采用__GLIBC__来判定是否有execinfo.h的方法
1 parent ca1bfbd commit 4b66a71

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

modules/base/backtrace.cpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,11 @@
2121
#include "backtrace.h"
2222

2323
/**
24-
* 目前只有glibc支持execinfo.h,其它库如uclibc是没有支持。为避免编译出错,在此区别处理
25-
* 如果外面没有指定HAVE_EXECINFO_H,则根据是否采用glibc库自动处理
24+
* 目前只有glibc支持execinfo.h,其它库如uclibc是没有支持。
25+
* 为避免编译出错,可以在外部将 HAVE_EXECINFO_H 指定为0
2626
*/
2727
#ifndef HAVE_EXECINFO_H
28-
# ifdef __GLIBC__
29-
# define HAVE_EXECINFO_H 1
30-
# else
31-
# define HAVE_EXECINFO_H 0
32-
# endif //__GLIBC__
28+
# define HAVE_EXECINFO_H 1 //! 如果是uclibc,请改成0
3329
#endif //HAVE_EXECINFO_H
3430

3531
#if HAVE_EXECINFO_H

modules/main/error_signals.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
* of the source tree.
1919
*/
2020
#include <signal.h>
21-
#include <execinfo.h>
2221

2322
#include <cstring>
2423
#include <iostream>

version.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@
2121
# TBOX版本号
2222
TBOX_VERSION_MAJOR := 1
2323
TBOX_VERSION_MINOR := 10
24-
TBOX_VERSION_REVISION := 24
24+
TBOX_VERSION_REVISION := 25

0 commit comments

Comments
 (0)