mirror of
https://github.com/ossrs/srs.git
synced 2025-02-13 03:41:55 +00:00
merge 2.0
This commit is contained in:
commit
c0498c82ee
1 changed files with 1 additions and 4 deletions
|
@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
// current release version
|
||||
#define VERSION_MAJOR 3
|
||||
#define VERSION_MINOR 0
|
||||
#define VERSION_REVISION 211
|
||||
#define VERSION_REVISION 212
|
||||
|
||||
// generated by configure, only macros.
|
||||
#include <srs_auto_headers.hpp>
|
||||
|
@ -136,8 +136,5 @@ 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)
|
||||
#error "for arm, only support glibc <= 2.15"
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue