diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 98fffae59..e0fa75913 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // current release version #define VERSION_MAJOR 2 #define VERSION_MINOR 0 -#define VERSION_REVISION 34 +#define VERSION_REVISION 35 // server info. #define RTMP_SIG_SRS_KEY "SRS" #define RTMP_SIG_SRS_ROLE "origin/edge server" diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp index 4a47f1c66..dcb3b5448 100644 --- a/trunk/src/main/srs_main_server.cpp +++ b/trunk/src/main/srs_main_server.cpp @@ -164,12 +164,12 @@ int main(int argc, char** argv) ProfilerStart("gperf.srs.gcp"); #endif + // directly compile error when these two macro defines. #if defined(SRS_AUTO_GPERF_MC) && defined(SRS_AUTO_GPERF_MP) - srs_error("option --with-gmc confict with --with-gmp, " + #error ("option --with-gmc confict with --with-gmp, " "@see: http://google-perftools.googlecode.com/svn/trunk/doc/heap_checker.html\n" "Note that since the heap-checker uses the heap-profiling framework internally, " "it is not possible to run both the heap-checker and heap profiler at the same time"); - return -1; #endif // never use srs log(srs_trace, srs_error, etc) before config parse the option,