Merge branch '2.0release' into develop

2015-03-16 10:24:25 +08:00 · 2015-03-16 10:24:25 +08:00 · 67671e43f9
commit 67671e43f9
parent 19ec1dafb7 8ee0826e9a
1 changed files with 1 additions and 0 deletions
--- a/trunk/src/app/srs_app_http.cpp
+++ b/trunk/src/app/srs_app_http.cpp
@ -27,6 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

 #include <stdlib.h>
 #include <sys/stat.h>
+#include <algorithm>
 using namespace std;

 #include <srs_kernel_error.hpp>