forked from mirrors/nixpkgs
48 lines
1.4 KiB
Diff
48 lines
1.4 KiB
Diff
|
diff --git a/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h b/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h
|
||
|
--- a/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h
|
||
|
+++ b/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h
|
||
|
@@ -25,16 +25,8 @@
|
||
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||
|
*/
|
||
|
|
||
|
-#ifndef __STUN_H__
|
||
|
-#define __STUN_H__
|
||
|
-
|
||
|
-// This file contains classes for dealing with the STUN and TURN protocols.
|
||
|
-// Both protocols use the same wire format.
|
||
|
-
|
||
|
-#include "talk/base/basictypes.h"
|
||
|
-#include "talk/base/bytebuffer.h"
|
||
|
-#include <string>
|
||
|
-#include <vector>
|
||
|
+#ifndef STUN__HH__IN__STUNREQUEST_CYCLIC_PROBLEM_FIX
|
||
|
+#define STUN__HH__IN__STUNREQUEST_CYCLIC_PROBLEM_FIX
|
||
|
|
||
|
namespace cricket {
|
||
|
|
||
|
@@ -55,6 +47,23 @@
|
||
|
STUN_DATA_INDICATION = 0x0115
|
||
|
};
|
||
|
|
||
|
+}
|
||
|
+
|
||
|
+#endif // STUN__HH__IN__STUNREQUEST_CYCLIC_PROBLEM_FIX
|
||
|
+
|
||
|
+#ifndef __STUN_H__
|
||
|
+#define __STUN_H__
|
||
|
+
|
||
|
+// This file contains classes for dealing with the STUN and TURN protocols.
|
||
|
+// Both protocols use the same wire format.
|
||
|
+
|
||
|
+#include "talk/base/basictypes.h"
|
||
|
+#include "talk/base/bytebuffer.h"
|
||
|
+#include <string>
|
||
|
+#include <vector>
|
||
|
+
|
||
|
+namespace cricket {
|
||
|
+
|
||
|
// These are the types of attributes defined in STUN & TURN. Next to each is
|
||
|
// the name of the class (T is StunTAttribute) that implements that type.
|
||
|
enum StunAttributeType {
|
||
|
|