| commit | aebb1ade9d760841f243e380fa22b7ecff2d3ecc | [log] [tgz] |
|---|---|---|
| author | henrika@webrtc.org <henrika@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Tue Jan 14 10:00:58 2014 +0000 |
| committer | henrika@webrtc.org <henrika@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Tue Jan 14 10:00:58 2014 +0000 |
| tree | f71bb0034f2ab344bea85988014ec96cb86807bb | |
| parent | 4371d4650ab2c1bbfa3b97133100ddf33312a199 [diff] [blame] |
pRevert 5371 "Revert 5367 "Update talk to 59410372."" > Revert 5367 "Update talk to 59410372." > > > Update talk to 59410372. > > > > R=jiayl@webrtc.org, wu@webrtc.org > > > > Review URL: https://webrtc-codereview.appspot.com/6929004 > > TBR=mallinath@webrtc.org > > Review URL: https://webrtc-codereview.appspot.com/6999004 TBR=henrika@webrtc.org Review URL: https://webrtc-codereview.appspot.com/7109004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5381 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/media/sctp/sctpdataengine.h b/talk/media/sctp/sctpdataengine.h index 8a5b4be..b34a810 100644 --- a/talk/media/sctp/sctpdataengine.h +++ b/talk/media/sctp/sctpdataengine.h
@@ -30,7 +30,7 @@ #include <errno.h> #include <string> -#include <vector> +#include <set> namespace cricket { // Some ERRNO values get re-#defined to WSA* equivalents in some talk/ @@ -216,7 +216,6 @@ talk_base::Buffer* buffer); void OnNotificationFromSctp(talk_base::Buffer* buffer); void OnNotificationAssocChange(const sctp_assoc_change& change); - void OnStreamResetEvent(const struct sctp_stream_reset_event* evt); // Responsible for marshalling incoming data to the channels listeners, and