胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
c0498c82 2 parents 8ad7da1c e775eb3f

merge 2.0

内嵌 并排对比
正在显示 1 个修改的文件 包含 1 行增加 和 4 行删除
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31 // current release version 31 // current release version
32 #define VERSION_MAJOR 3 32 #define VERSION_MAJOR 3
33 #define VERSION_MINOR 0 33 #define VERSION_MINOR 0
34 -#define VERSION_REVISION 211 34 +#define VERSION_REVISION 212
35 35
36 // generated by configure, only macros. 36 // generated by configure, only macros.
37 #include <srs_auto_headers.hpp> 37 #include <srs_auto_headers.hpp>
@@ -136,8 +136,5 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -136,8 +136,5 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
136 #if !defined(__amd64__) && !defined(__x86_64__) && !defined(__i386__) && !defined(__arm__) 136 #if !defined(__amd64__) && !defined(__x86_64__) && !defined(__i386__) && !defined(__arm__)
137 #error "only support i386/amd64/x86_64/arm cpu" 137 #error "only support i386/amd64/x86_64/arm cpu"
138 #endif 138 #endif
139 -#if defined(__arm__) && (__GLIBC__ != 2 || __GLIBC_MINOR__ > 15)  
140 - #error "for arm, only support glibc <= 2.15"  
141 -#endif  
142 139
143 #endif 140 #endif