Merge branch '2.0release' into develop

10 years ago · 070ada1d6e
parent d8f18aee37 65e4bf2e77
commit 070ada1d6e
1 changed files with 1 additions and 1 deletions
--- a/trunk/src/core/srs_core.hpp
+++ b/trunk/src/core/srs_core.hpp
@ -128,7 +128,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #if !defined(__amd64__) && !defined(__x86_64__) && !defined(__i386__) && !defined(__arm__)
    #error "only support i386/amd64/x86_64/arm cpu"
 #endif
-#if defined(__arm__) && __GLIBC__ != 2 || __GLIBC_MINOR__ > 15
+#if defined(__arm__) && (__GLIBC__ != 2 || __GLIBC_MINOR__ > 15)
    #error "for arm, only support glibc <= 2.15"
 #endif