Skip to content

Commit a554dd8

Browse files
committed
Fix GCC7 build error, this statement may fall through. 2.0.263
1 parent 91c462b commit a554dd8

File tree

4 files changed

+17
-1
lines changed

4 files changed

+17
-1
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,7 @@ Remark:
335335

336336
## History
337337

338+
* v2.0, 2019-04-05, Merge [#1312][bug #1312], Fix GCC7 build error, this statement may fall through. 2.0.263
338339
* v2.0, 2019-04-05, Merge [#1339][bug #1339], Support HTTP-FLV params. 2.0.262
339340
* v2.0, 2018-12-01, Merge [#1274][bug #1274], Upgrade to FFMPEG 4.1 and X264 157. 2.0.261
340341
* v2.0, 2018-11-11, Merge [#1261][bug #1261], Support `_definst_` for Wowza. 2.0.260
@@ -1344,6 +1345,7 @@ Winlin
13441345
[bug #1261]: https://github.com/ossrs/srs/issues/1261
13451346
[bug #1274]: https://github.com/ossrs/srs/pull/1274
13461347
[bug #1339]: https://github.com/ossrs/srs/pull/1339
1348+
[bug #1312]: https://github.com/ossrs/srs/pull/1312
13471349
[bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx
13481350

13491351
[exo #828]: https://github.com/google/ExoPlayer/pull/828
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
--- Makefile 2019-04-05 19:43:32.000000000 +0800
2+
+++ ../http-parser-2.1-patch/Makefile 2019-04-05 19:50:26.000000000 +0800
3+
@@ -7,7 +7,8 @@ CPPFLAGS_DEBUG += $(CPPFLAGS_DEBUG_EXTRA
4+
CPPFLAGS_FAST = $(CPPFLAGS) -DHTTP_PARSER_STRICT=0
5+
CPPFLAGS_FAST += $(CPPFLAGS_FAST_EXTRA)
6+
7+
-CFLAGS += -Wall -Wextra -Werror
8+
+# patch by winlin
9+
+CFLAGS += -Wall -Wextra
10+
CFLAGS_DEBUG = $(CFLAGS) -O0 -g $(CFLAGS_DEBUG_EXTRA)
11+
CFLAGS_FAST = $(CFLAGS) -O3 $(CFLAGS_FAST_EXTRA)
12+
CFLAGS_LIB = $(CFLAGS_FAST) -fPIC

trunk/auto/depends.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,8 @@ if [ $SRS_HTTP_CORE = YES ]; then
482482
rm -rf ${SRS_OBJS}/http-parser-2.1 && cd ${SRS_OBJS} && unzip -q ../3rdparty/http-parser-2.1.zip &&
483483
cd http-parser-2.1 &&
484484
patch -p0 < ../../3rdparty/patches/2.http.parser.patch &&
485+
# Patch build error for https://github.com/ossrs/srs/pull/1312#issuecomment-480243404
486+
patch -p0 < ../../3rdparty/patches/7.http.parser.patch &&
485487
make package &&
486488
cd .. && rm -rf hp && ln -sf http-parser-2.1 hp &&
487489
cd .. && rm -f ${SRS_OBJS}/_flag.st.hp.tmp

trunk/src/core/srs_core.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3131
// current release version
3232
#define VERSION_MAJOR 2
3333
#define VERSION_MINOR 0
34-
#define VERSION_REVISION 262
34+
#define VERSION_REVISION 263
3535

3636
// generated by configure, only macros.
3737
#include <srs_auto_headers.hpp>

0 commit comments

Comments
 (0)