From 6a9b155798ebe0854f035de61bae79460060f3d3 Mon Sep 17 00:00:00 2001 From: "buildbot@webrtc.org" Date: Wed, 17 Sep 2014 08:08:38 +0000 Subject: [PATCH] (Auto)update libjingle 75683337-> 75695882 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7206 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/p2p/base/asyncstuntcpsocket.h | 6 +++--- talk/p2p/base/basicpacketsocketfactory.h | 6 +++--- talk/p2p/base/packetsocketfactory.h | 6 +++--- talk/p2p/client/autoportallocator.h | 6 +++--- talk/p2p/client/sessionmanagertask.h | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/talk/p2p/base/asyncstuntcpsocket.h b/talk/p2p/base/asyncstuntcpsocket.h index b63c0b5408..136b4df4fe 100644 --- a/talk/p2p/base/asyncstuntcpsocket.h +++ b/talk/p2p/base/asyncstuntcpsocket.h @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef TALK_BASE_ASYNCSTUNTCPSOCKET_H_ -#define TALK_BASE_ASYNCSTUNTCPSOCKET_H_ +#ifndef TALK_P2P_BASE_ASYNCSTUNTCPSOCKET_H_ +#define TALK_P2P_BASE_ASYNCSTUNTCPSOCKET_H_ #include "webrtc/base/asynctcpsocket.h" #include "webrtc/base/scoped_ptr.h" @@ -64,4 +64,4 @@ class AsyncStunTCPSocket : public rtc::AsyncTCPSocketBase { } // namespace cricket -#endif // TALK_BASE_ASYNCSTUNTCPSOCKET_H_ +#endif // TALK_P2P_BASE_ASYNCSTUNTCPSOCKET_H_ diff --git a/talk/p2p/base/basicpacketsocketfactory.h b/talk/p2p/base/basicpacketsocketfactory.h index b1bae3582d..77b16524c8 100644 --- a/talk/p2p/base/basicpacketsocketfactory.h +++ b/talk/p2p/base/basicpacketsocketfactory.h @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef TALK_BASE_BASICPACKETSOCKETFACTORY_H_ -#define TALK_BASE_BASICPACKETSOCKETFACTORY_H_ +#ifndef TALK_P2P_BASE_BASICPACKETSOCKETFACTORY_H_ +#define TALK_P2P_BASE_BASICPACKETSOCKETFACTORY_H_ #include "talk/p2p/base/packetsocketfactory.h" @@ -65,4 +65,4 @@ class BasicPacketSocketFactory : public PacketSocketFactory { } // namespace rtc -#endif // TALK_BASE_BASICPACKETSOCKETFACTORY_H_ +#endif // TALK_P2P_BASE_BASICPACKETSOCKETFACTORY_H_ diff --git a/talk/p2p/base/packetsocketfactory.h b/talk/p2p/base/packetsocketfactory.h index 6b82682d61..46767c2504 100644 --- a/talk/p2p/base/packetsocketfactory.h +++ b/talk/p2p/base/packetsocketfactory.h @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef TALK_BASE_PACKETSOCKETFACTORY_H_ -#define TALK_BASE_PACKETSOCKETFACTORY_H_ +#ifndef TALK_P2P_BASE_PACKETSOCKETFACTORY_H_ +#define TALK_P2P_BASE_PACKETSOCKETFACTORY_H_ #include "webrtc/base/proxyinfo.h" @@ -66,4 +66,4 @@ class PacketSocketFactory { } // namespace rtc -#endif // TALK_BASE_PACKETSOCKETFACTORY_H_ +#endif // TALK_P2P_BASE_PACKETSOCKETFACTORY_H_ diff --git a/talk/p2p/client/autoportallocator.h b/talk/p2p/client/autoportallocator.h index 298f82918d..ed87162e47 100644 --- a/talk/p2p/client/autoportallocator.h +++ b/talk/p2p/client/autoportallocator.h @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef TALK_EXAMPLES_LOGIN_AUTOPORTALLOCATOR_H_ -#define TALK_EXAMPLES_LOGIN_AUTOPORTALLOCATOR_H_ +#ifndef TALK_P2P_CLIENT_AUTOPORTALLOCATOR_H_ +#define TALK_P2P_CLIENT_AUTOPORTALLOCATOR_H_ #include #include @@ -66,4 +66,4 @@ class AutoPortAllocator : public cricket::HttpPortAllocator { } }; -#endif // TALK_EXAMPLES_LOGIN_AUTOPORTALLOCATOR_H_ +#endif // TALK_P2P_CLIENT_AUTOPORTALLOCATOR_H_ diff --git a/talk/p2p/client/sessionmanagertask.h b/talk/p2p/client/sessionmanagertask.h index d7d9733e64..e16d9d6f78 100644 --- a/talk/p2p/client/sessionmanagertask.h +++ b/talk/p2p/client/sessionmanagertask.h @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _SESSIONMANAGERTASK_H_ -#define _SESSIONMANAGERTASK_H_ +#ifndef TALK_P2P_CLIENT_SESSIONMANAGERTASK_H_ +#define TALK_P2P_CLIENT_SESSIONMANAGERTASK_H_ #include "talk/p2p/base/sessionmanager.h" #include "talk/p2p/client/sessionsendtask.h" @@ -90,4 +90,4 @@ class SessionManagerTask : public buzz::XmppTask { } // namespace cricket -#endif // _SESSIONMANAGERTASK_H_ +#endif // TALK_P2P_CLIENT_SESSIONMANAGERTASK_H_