Changeset 992 for pjproject/trunk/pjlib-util/include/pjlib-util.h

Timestamp:

Feb 21, 2007 12:40:05 AM (17 years ago)

Author:

bennylp

Message:

Merged the ICE branch into the trunk

File:

• pjproject/trunk/pjlib-util/include/pjlib-util.h (modified) (1 diff)

pjproject/trunk/pjlib-util/include/pjlib-util.h

@@ -31 +31 @@
 #include <pjlib-util/resolver.h>
 #include <pjlib-util/scanner.h>
-#include <pjlib-util/stun.h>
 #include <pjlib-util/xml.h>
 
+/* New STUN */
+#include <pjlib-util/stun_endpoint.h>
+#include <pjlib-util/stun_msg.h>
+#include <pjlib-util/stun_server.h>
+#include <pjlib-util/stun_transaction.h>
+
+/* Old STUN */
+#include <pjlib-util/stun_simple.h>
 
 /**