merge from 1.0 hotfix. 3.0.35

@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // current release version
 // current release version
 #define VERSION_MAJOR       2
 #define VERSION_MAJOR       2
 #define VERSION_MINOR       0
 #define VERSION_MINOR       0
-#define VERSION_REVISION    34
+#define VERSION_REVISION    35
 // server info.
 // server info.
 #define RTMP_SIG_SRS_KEY "SRS"
 #define RTMP_SIG_SRS_KEY "SRS"
 #define RTMP_SIG_SRS_ROLE "origin/edge server"
 #define RTMP_SIG_SRS_ROLE "origin/edge server"

@@ -164,12 +164,12 @@ int main(int argc, char** argv)
     ProfilerStart("gperf.srs.gcp");
     ProfilerStart("gperf.srs.gcp");
 #endif
 #endif
 
 
+    // directly compile error when these two macro defines.
 #if defined(SRS_AUTO_GPERF_MC) && defined(SRS_AUTO_GPERF_MP)
 #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"
         "@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, "
         "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");
         "it is not possible to run both the heap-checker and heap profiler at the same time");
-    return -1;
 #endif
 #endif
     
     
     // never use srs log(srs_trace, srs_error, etc) before config parse the option,
     // never use srs log(srs_trace, srs_error, etc) before config parse the option,