diff options
author | Benny Prijono <bennylp@teluu.com> | 2007-02-21 00:40:05 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2007-02-21 00:40:05 +0000 |
commit | 1a5b8c19989c4ab4e1eee7f712913f8f3e459e71 (patch) | |
tree | 94d7851e91849c6b60420150c8944db9bcf4b298 /pjlib-util/include/pjlib-util.h | |
parent | b69a9ab56a1df4a41bfa9132d5aa5263fa80b38b (diff) |
Merged the ICE branch into the trunk
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@992 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib-util/include/pjlib-util.h')
-rw-r--r-- | pjlib-util/include/pjlib-util.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pjlib-util/include/pjlib-util.h b/pjlib-util/include/pjlib-util.h index 38f4ea1a..0f7848a8 100644 --- a/pjlib-util/include/pjlib-util.h +++ b/pjlib-util/include/pjlib-util.h @@ -30,9 +30,16 @@ #include <pjlib-util/md5.h> #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> /** * @addtogroup PJLIB_UTIL |