external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Merge branch '2.0release' into develop

Browse source
This commit is contained in:
winlin 2016-09-03 23:11:58 +08:00
commit 39a46f7b97
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
trunk/src/core/srs_core.hpp
View file

@ -129,9 +129,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
/** /**
* important check for st(state-threads), * important check for st(state-threads),
* only support the following cpus: * only support the following cpus: i386/amd64/x86_64/arm
* 1. i386/amd64/x86_64 * @reamrk to patch ST for arm, read https://github.com/ossrs/state-threads/issues/1
* 2. arm, glibc <= 2.15
*/ */
#if !defined(__amd64__) && !defined(__x86_64__) && !defined(__i386__) && !defined(__arm__) #if !defined(__amd64__) && !defined(__x86_64__) && !defined(__i386__) && !defined(__arm__)
#error "only support i386/amd64/x86_64/arm cpu" #error "only support i386/amd64/x86_64/arm cpu"