summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbuildbot@webrtc.org <buildbot@webrtc.org>2014-09-17 08:08:38 +0000
committerbuildbot@webrtc.org <buildbot@webrtc.org>2014-09-17 08:08:38 +0000
commit030de9507c92937a3022ec39cbed86fd4c6a6d82 (patch)
tree0125f731ed5d2aca2ba2a47cddb66f951ca37dad
parentcacae6120f0d5968d8bf4fe8d863b03b38d2f2b3 (diff)
downloadtalk-030de9507c92937a3022ec39cbed86fd4c6a6d82.tar.gz
(Auto)update libjingle 75683337-> 75695882
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@7206 4adac7df-926f-26a2-2b94-8c16560cd09d
-rw-r--r--p2p/base/asyncstuntcpsocket.h6
-rw-r--r--p2p/base/basicpacketsocketfactory.h6
-rw-r--r--p2p/base/packetsocketfactory.h6
-rw-r--r--p2p/client/autoportallocator.h6
-rw-r--r--p2p/client/sessionmanagertask.h6
5 files changed, 15 insertions, 15 deletions
diff --git a/p2p/base/asyncstuntcpsocket.h b/p2p/base/asyncstuntcpsocket.h
index b63c0b5..136b4df 100644
--- a/p2p/base/asyncstuntcpsocket.h
+++ b/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/p2p/base/basicpacketsocketfactory.h b/p2p/base/basicpacketsocketfactory.h
index b1bae35..77b1652 100644
--- a/p2p/base/basicpacketsocketfactory.h
+++ b/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/p2p/base/packetsocketfactory.h b/p2p/base/packetsocketfactory.h
index 6b82682..46767c2 100644
--- a/p2p/base/packetsocketfactory.h
+++ b/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/p2p/client/autoportallocator.h b/p2p/client/autoportallocator.h
index 298f829..ed87162 100644
--- a/p2p/client/autoportallocator.h
+++ b/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 <string>
#include <vector>
@@ -66,4 +66,4 @@ class AutoPortAllocator : public cricket::HttpPortAllocator {
}
};
-#endif // TALK_EXAMPLES_LOGIN_AUTOPORTALLOCATOR_H_
+#endif // TALK_P2P_CLIENT_AUTOPORTALLOCATOR_H_
diff --git a/p2p/client/sessionmanagertask.h b/p2p/client/sessionmanagertask.h
index d7d9733..e16d9d6 100644
--- a/p2p/client/sessionmanagertask.h
+++ b/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_