|
1 # HG changeset patch |
|
2 # Parent 0b3f9d97af70d01863519daf4f57f8918b4bc17c |
|
3 # User Wolfgang Rosenauer <wr@rosenauer.org> |
|
4 Bug 805549 - signaling_sipcc fails to compile because of unused variable |
|
5 |
|
6 diff --git a/media/webrtc/signaling/signaling.gyp b/media/webrtc/signaling/signaling.gyp |
|
7 --- a/media/webrtc/signaling/signaling.gyp |
|
8 +++ b/media/webrtc/signaling/signaling.gyp |
|
9 @@ -189,17 +189,16 @@ |
|
10 'SIP_OS_LINUX', |
|
11 '_GNU_SOURCE', |
|
12 'LINUX', |
|
13 'GIPS_VER=3510', |
|
14 'SECLIB_OPENSSL', |
|
15 ], |
|
16 |
|
17 'cflags_mozilla': [ |
|
18 - '-Werror', |
|
19 ], |
|
20 }], |
|
21 ['OS=="win"', { |
|
22 'include_dirs': [ |
|
23 ], |
|
24 'defines': [ |
|
25 'SIP_OS_WINDOWS', |
|
26 'WIN32', |
|
27 @@ -217,18 +216,16 @@ |
|
28 ], |
|
29 'defines': [ |
|
30 'SIP_OS_OSX', |
|
31 'OSX', |
|
32 '_FORTIFY_SOURCE=2', |
|
33 ], |
|
34 |
|
35 'cflags_mozilla': [ |
|
36 - '-Werror', |
|
37 - '-Wno-error=conversion' |
|
38 ], |
|
39 }], |
|
40 ], |
|
41 }, |
|
42 |
|
43 # |
|
44 # SIPCC |
|
45 # |
|
46 @@ -641,17 +638,16 @@ |
|
47 'USE_TIMER_SELECT_BASED', |
|
48 'FULL_BUILD', |
|
49 'STUBBED_OUT', |
|
50 'USE_PRINTF' |
|
51 'LINUX', |
|
52 ], |
|
53 |
|
54 'cflags_mozilla': [ |
|
55 - '-Werror', |
|
56 ], |
|
57 }], |
|
58 ['OS=="win"', { |
|
59 'include_dirs': [ |
|
60 ], |
|
61 |
|
62 'sources': [ |
|
63 # SIPSTACK |
|
64 @@ -760,18 +756,16 @@ |
|
65 'FULL_BUILD', |
|
66 'STUBBED_OUT', |
|
67 'USE_PRINTF', |
|
68 '_DARWIN_C_SOURCE', |
|
69 'NO_NSPR_10_SUPPORT', |
|
70 ], |
|
71 |
|
72 'cflags_mozilla': [ |
|
73 - '-Werror', |
|
74 - '-Wno-error=conversion' |
|
75 ], |
|
76 }], |
|
77 ], |
|
78 |
|
79 }, |
|
80 ], |
|
81 } |
|
82 |
|
83 diff --git a/media/webrtc/signaling/src/sipcc/core/common/config_parser.c b/media/webrtc/signaling/src/sipcc/core/common/config_parser.c |
|
84 --- a/media/webrtc/signaling/src/sipcc/core/common/config_parser.c |
|
85 +++ b/media/webrtc/signaling/src/sipcc/core/common/config_parser.c |
|
86 @@ -402,17 +402,16 @@ void config_set_ccm_ip_mac () |
|
87 /* |
|
88 * config_setup_element |
|
89 * Setup elements that once were downloaded from CUCM in an XML file. |
|
90 * Settings are stored in config.h |
|
91 */ |
|
92 void config_setup_elements (const char *sipUser, const char *sipPassword, const char *sipDomain) |
|
93 { |
|
94 unsigned int i; |
|
95 - char buf[MAX_SIP_URL_LENGTH] = {'\0'}; |
|
96 char ip[MAX_SIP_URL_LENGTH] = {'\0'}; |
|
97 char option[MAX_SIP_URL_LENGTH] = {'\0'}; |
|
98 int line = 0; |
|
99 cc_boolean isSecure = FALSE, isValid = TRUE; |
|
100 char macaddr[MAC_ADDR_SIZE]; |
|
101 |
|
102 compare_or_set_int_value(CFGID_MEDIA_PORT_RANGE_START, gStartMediaPort, (const unsigned char *) "startMediaPort"); |
|
103 compare_or_set_int_value(CFGID_MEDIA_PORT_RANGE_END, gStopMediaPort, (const unsigned char *) "stopMediaPort"); |