| Index: webrtc/media/sctp/sctpdataengine.h
|
| diff --git a/talk/media/sctp/sctpdataengine.h b/webrtc/media/sctp/sctpdataengine.h
|
| similarity index 97%
|
| rename from talk/media/sctp/sctpdataengine.h
|
| rename to webrtc/media/sctp/sctpdataengine.h
|
| index 4bc5f0b6fb5b132d603534388c7a71e1fa28d940..cbb470ba5ba5fca3ee6b4c9286955d5ae6406a87 100644
|
| --- a/talk/media/sctp/sctpdataengine.h
|
| +++ b/webrtc/media/sctp/sctpdataengine.h
|
| @@ -1,6 +1,6 @@
|
| /*
|
| * libjingle
|
| - * Copyright 2012 Google Inc. and Robin Seggelmann
|
| + * Copyright 2012 Google Inc.
|
| *
|
| * Redistribution and use in source and binary forms, with or without
|
| * modification, are permitted provided that the following conditions are met:
|
| @@ -25,8 +25,8 @@
|
| * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#ifndef TALK_MEDIA_SCTP_SCTPDATAENGINE_H_
|
| -#define TALK_MEDIA_SCTP_SCTPDATAENGINE_H_
|
| +#ifndef WEBRTC_MEDIA_SCTP_SCTPDATAENGINE_H_
|
| +#define WEBRTC_MEDIA_SCTP_SCTPDATAENGINE_H_
|
|
|
| #include <errno.h>
|
| #include <string>
|
| @@ -41,11 +41,11 @@ enum PreservedErrno {
|
| };
|
| } // namespace cricket
|
|
|
| -#include "talk/media/base/codec.h"
|
| -#include "talk/media/base/mediachannel.h"
|
| -#include "talk/media/base/mediaengine.h"
|
| #include "webrtc/base/buffer.h"
|
| #include "webrtc/base/scoped_ptr.h"
|
| +#include "webrtc/media/base/codec.h"
|
| +#include "webrtc/media/base/mediachannel.h"
|
| +#include "webrtc/media/base/mediaengine.h"
|
|
|
| // Defined by "usrsctplib/usrsctp.h"
|
| struct sockaddr_conn;
|
| @@ -253,4 +253,4 @@ class SctpDataMediaChannel : public DataMediaChannel,
|
|
|
| } // namespace cricket
|
|
|
| -#endif // TALK_MEDIA_SCTP_SCTPDATAENGINE_H_
|
| +#endif // WEBRTC_MEDIA_SCTP_SCTPDATAENGINE_H_
|
|
|