From e42633cd65a4cae5789ae22cfead83e617bec7cf Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 25 Dec 2019 16:04:28 +0800 Subject: [PATCH] For #1537, #1282, when not use builtin setjmp, donot compile md.S --- trunk/3rdparty/st-srs/md.S | 3 +++ trunk/3rdparty/st-srs/md.h | 1 + 2 files changed, 4 insertions(+) diff --git a/trunk/3rdparty/st-srs/md.S b/trunk/3rdparty/st-srs/md.S index 5d909e28d..7b444a93f 100644 --- a/trunk/3rdparty/st-srs/md.S +++ b/trunk/3rdparty/st-srs/md.S @@ -1,3 +1,5 @@ +#if defined(MD_USE_BUILTIN_SETJMP) + /* * Portions created by SGI are Copyright (C) 2000 Silicon Graphics, Inc. * All Rights Reserved. @@ -504,3 +506,4 @@ #endif +#endif diff --git a/trunk/3rdparty/st-srs/md.h b/trunk/3rdparty/st-srs/md.h index 1716dc08b..115e6fdce 100644 --- a/trunk/3rdparty/st-srs/md.h +++ b/trunk/3rdparty/st-srs/md.h @@ -420,6 +420,7 @@ #elif defined(__arm__) #define MD_STACK_GROWS_DOWN + /* https://github.com/ossrs/state-threads/issues/1#issuecomment-244648573 */ #define MD_USE_BUILTIN_SETJMP /* force to use glibc solution, hack the guard jmpbuf from michaeltalyansky */