summaryrefslogtreecommitdiff
path: root/stun
diff options
context:
space:
mode:
authorYouness Alaoui <youness.alaoui@collabora.co.uk>2010-07-15 15:08:19 -0400
committerYouness Alaoui <youness.alaoui@collabora.co.uk>2010-07-15 15:08:19 -0400
commit26042608559c6e04171f855b78356083f92c8e96 (patch)
treea4b08c0053a999a8b413b7f628e07de1c3b7e6c7 /stun
parent824a25d145311a3db65c9c63d2f57ecfb949ab04 (diff)
downloadlibnice-26042608559c6e04171f855b78356083f92c8e96.tar.gz
Rename function crc32 to stun_crc32 to avoid conflict with existing crc32 function in libz.so
Diffstat (limited to 'stun')
-rw-r--r--stun/stun5389.c2
-rw-r--r--stun/stuncrc32.c2
-rw-r--r--stun/stuncrc32.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/stun/stun5389.c b/stun/stun5389.c
index 3b993b0..136531d 100644
--- a/stun/stun5389.c
+++ b/stun/stun5389.c
@@ -83,7 +83,7 @@ uint32_t stun_fingerprint (const uint8_t *msg, size_t len,
/* first 4 bytes done, last 8 bytes not summed */
data[2].len = len - 12u;
- return htonl (crc32 (data, 3, wlm2009_stupid_crc32_typo) ^ 0x5354554e);
+ return htonl (stun_crc32 (data, 3, wlm2009_stupid_crc32_typo) ^ 0x5354554e);
}
bool stun_message_has_cookie (const StunMessage *msg)
diff --git a/stun/stuncrc32.c b/stun/stuncrc32.c
index e2d26e3..288b7f2 100644
--- a/stun/stuncrc32.c
+++ b/stun/stuncrc32.c
@@ -140,7 +140,7 @@ static const uint32_t crc32_tab[] = {
};
-uint32_t crc32 (const crc_data *data, size_t n, bool wlm2009_stupid_crc32_typo)
+uint32_t stun_crc32 (const crc_data *data, size_t n, bool wlm2009_stupid_crc32_typo)
{
size_t i;
uint32_t crc = 0xffffffff;
diff --git a/stun/stuncrc32.h b/stun/stuncrc32.h
index 08ab034..8efc92c 100644
--- a/stun/stuncrc32.h
+++ b/stun/stuncrc32.h
@@ -54,6 +54,6 @@ typedef struct {
} crc_data;
-uint32_t crc32 (const crc_data *data, size_t n, bool wlm2009_stupid_crc32_typo);
+uint32_t stun_crc32 (const crc_data *data, size_t n, bool wlm2009_stupid_crc32_typo);
#endif /* _CRC32_H */