diff options
| author | Mikhail Zabaluev <mikhail.zabaluev@nokia.com> | 2011-02-15 14:42:41 +0200 |
|---|---|---|
| committer | Mikhail Zabaluev <mikhail.zabaluev@nokia.com> | 2011-02-15 14:43:42 +0200 |
| commit | 13d1557121f2a20eb98b8b2d0786d57f1a35edb2 (patch) | |
| tree | 25d378452623e5396f4206da516faa4f251551d4 | |
| parent | 1e56054fc8f87fc65fd8bd032e23cfda4957ec72 (diff) | |
Fix up a merge omission
Maybe doing merge -s recursive -X ours was not such a good idea...
| -rw-r--r-- | src/sip-connection-helpers.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/sip-connection-helpers.c b/src/sip-connection-helpers.c index 9f72ed5..d85fc38 100644 --- a/src/sip-connection-helpers.c +++ b/src/sip-connection-helpers.c @@ -644,6 +644,7 @@ void rakia_conn_discover_stun_server (RakiaConnection *conn) { RakiaConnectionPrivate *priv = TPSIP_CONNECTION_GET_PRIVATE (conn); + const char *url_host; char *srv_domain; struct in_addr test_addr; |