winlin

Merge branch 'srs.master'

... ... @@ -11,10 +11,8 @@
#include "public.h"
#if !defined(__ia64__)
#if defined(__ia64__)
#error "IA64 not supported"
#else
#error "Only IA64 supported"
#endif
#define srs_trace(msg, ...) printf(msg, ##__VA_ARGS__);printf("\n")
... ...
... ... @@ -140,6 +140,7 @@ void check_macro_features()
#endif
#if VERSION_MAJOR > 1
#warning "using develop SRS, please use release instead."
srs_warn("SRS %s is develop branch, please use %s instead", RTMP_SIG_SRS_VERSION, RTMP_SIG_SRS_RELEASE);
#endif
}
... ...