Commit 0419e2ca authored by Nico Weber's avatar Nico Weber Committed by Commit Bot

Revert "Roll src/third_party/usrsctp/usrsctplib/ 2f6478eb8..76bea922c (48 commits)"

This reverts commit c1fdd91d.

Reason for revert: Warning still fires in at least one file:
FAILED: obj/third_party/usrsctp/usrsctp/sctp_callout.obj 
../../third_party/llvm-build/Release+Asserts/bin/clang-cl.exe /nologo /showIncludes  @obj/third_party/usrsctp/usrsctp/sctp_callout.obj.rsp /c ../../third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_callout.c /Foobj/third_party/usrsctp/usrsctp/sctp_callout.obj /Fd"obj/third_party/usrsctp/usrsctp_c.pdb"
In file included from ../../third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_callout.c:48:
In file included from ../../third_party/usrsctp/usrsctplib/usrsctplib\netinet/sctp_pcb.h:56:
In file included from ../../third_party/usrsctp/usrsctplib/usrsctplib\netinet/sctp_structs.h:42:
../../third_party/usrsctp/usrsctplib/usrsctplib\netinet/sctp_header.h(53,9):  error: unterminated '#pragma pack (push, ...)' at end of file [-Werror,-Wpragma-pack]
#pragma pack (push, 1)
        ^
../../third_party/usrsctp/usrsctplib/usrsctplib\netinet/sctp_header.h(606,9):  note: did you intend to use '#pragma pack (pop)' instead of '#pragma pack()'?
#pragma pack ()
        ^
              pop

Original change's description:
> Roll src/third_party/usrsctp/usrsctplib/ 2f6478eb8..76bea922c (48 commits)
> 
> Picks up 76bea922c, a fix for a new Clang warning.
> 
> https://chromium.googlesource.com/external/github.com/sctplab/usrsctp/+log/2f6478eb8d40..76bea922c32b
> 
> $ git log 2f6478eb8..76bea922c --date=short --no-merges --format='%ad %ae %s'
> 2017-07-28 hans Use '#pragma pack (pop)' instead of '#pragma pack ()'
> 2017-07-26 tuexen Check return value of if_indextoname().
> 2017-07-25 tuexen Remove duplicate statement.
> 2017-07-24 tuexen Add --enable-programs to configure script.
> 2017-07-20 tuexen Sync with sctp-idata.
> 2017-07-19 tuexen Sync with sctp-idata.
> 2017-07-19 tuexen Sync with sctp-idata.
> 2017-07-19 tuexen Sync with sctp-idata.
> 2017-07-18 weinrank update compiler settings for sanitizers
> 2017-07-18 weinrank adding sanitizer support - first try
> 2017-07-16 weinrank tsctp: fix compiler warning
> 2017-07-16 weinrank revert unreachable code changes
> 2017-07-16 weinrank Revert "Unreachable code when in "__Userspace__""
> 2017-07-16 weinrank Compiler flags: don't check for unreachable code
> 2017-07-16 weinrank tsctp: Windows compile fix
> 2017-07-16 weinrank Fix compiler warnings for more strict compiler flags
> 2017-07-16 weinrank Fix shadowed variable complain
> 2017-07-16 weinrank Unreachable code when in "__Userspace__"
> 2017-07-16 weinrank CFLAGS: don't set Werror by default
> 2017-07-16 weinrank More strict compiler flags
> 2017-07-15 tuexen Sycn with sctp-idata.
> 2017-07-15 weinrank CMake beautification
> 2017-07-15 weinrank CMake cleanup
> 2017-07-14 weinrank CMAKE refactoring
> 2017-07-13 weinrank correct include_directories path
> 2017-07-12 weinrank CMAKE refactoring
> 2017-07-11 weinrank ignore build directory
> 2017-07-04 tuexen Sync with sctp-idata.
> 2017-06-25 tuexen Remove unused code on Windows (which would not work).
> 2017-06-25 tuexen This should dead code. Try on buildbot.
> 2017-06-25 tuexen More signed/unsigned issues.
> 2017-06-25 tuexen Address some signed/unsigned issues.
> 2017-06-25 tuexen Improve build scripts.
> 2017-06-25 tuexen Silence a warning when using older versions of clang.
> 2017-06-25 tuexen Silence a warning showing up on clang 4.
> 2017-06-25 tuexen I missed this in the last commit...
> 2017-06-25 tuexen Remove datachan_serv.c.
> 2017-06-25 tuexen Address signess issues.
> 2017-06-25 tuexen Address windows type mismatches.
> 2017-06-25 tuexen Fix a bug reported in https://github.com/sctplab/usrsctp/pull/150/files
> 2017-06-25 tuexen Use lowercase names for include files.
> 2017-06-23 tuexen Sync with El Capitan sources.
> 2017-06-23 tuexen Sync with sctp-idata.
> 2017-06-23 tuexen Sync FBSDID.
> 2017-06-23 tuexen Fix FreeBSD compilation.
> 2017-06-23 tuexen Add -Wno-address-of-packed-member to build system.
> 2017-06-23 tuexen Sync with FreeBSD sources.
> 2017-05-15 anselm.scholl Fix truncation with snprintf in buffer:
> 
> Created with:
>   roll-dep src/third_party/usrsctp/usrsctplib
> 
> BUG=749197
> 
> Change-Id: I2b05f13a523679beaa2fb8dc75bbf0ea190c7129
> Reviewed-on: https://chromium-review.googlesource.com/594656
> Reviewed-by: Taylor Brandstetter <deadbeef@chromium.org>
> Commit-Queue: Hans Wennborg <hans@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#491010}

TBR=hans@chromium.org,deadbeef@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 749197
Change-Id: Idfef3d4c6217297113d0700a9317a89b4b90bac8
Reviewed-on: https://chromium-review.googlesource.com/598711Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Reviewed-by: default avatarHans Wennborg <hans@chromium.org>
Commit-Queue: Hans Wennborg <hans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#491582}
parent 20b46882
......@@ -214,7 +214,7 @@ deps = {
Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + 'bcaa2585874573d486d94101e883cd2e5dfbca97',
'src/third_party/usrsctp/usrsctplib':
Var('chromium_git') + '/external/github.com/sctplab/usrsctp' + '@' + '76bea922c32b742ecf5c4a0c64dcfb95ab5387c0',
Var('chromium_git') + '/external/github.com/sctplab/usrsctp' + '@' + '2f6478eb8d40f1766a96b5b033ed26c0c2244589',
'src/third_party/libsrtp':
Var('chromium_git') + '/chromium/deps/libsrtp.git' + '@' + '1d45b8e599dc2db6ea3ae22dbc94a8c504652423',
......
......@@ -9,6 +9,12 @@ config("usrsctp_config") {
"usrsctplib/usrsctplib",
"usrsctplib/usrsctplib/netinet",
]
if (is_clang && llvm_force_head_revision) {
cflags = [
# TODO(hans): https://crbug.com/749197
"-Wno-pragma-pack",
]
}
}
config("usrsctp_warnings") {
......
Name: usrsctp
URL: http://github.com/sctplab/usrsctp
Version: 0
Date: Jul 28, 2017
Revision: 76bea922c32b742ecf5c4a0c64dcfb95ab5387c0
Date: Jul 25, 2016
Revision: 9a3e5465e9d96d8a7f78f1e996412d6235d7a359
License: New BSD
License File: LICENSE
Security Critical: yes
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment