Changeset 443

Timestamp:

06/24/09 23:22:00 (16 years ago)

Author:

r2d

Message:

renamed crc32 to mpc_crc32 to avoid name conflics with static libs

Location:

libmpc/trunk

Files:

• common/crc32.c (modified) (1 diff)
• libmpcdec/streaminfo.c (modified) (2 diffs)
• libmpcenc/bitstream.c (modified) (2 diffs)

libmpc/trunk/common/crc32.c

@@ -51 +51 @@
 
 /* Return the CRC of the bytes buf[0..len-1]. */
-unsigned long crc32(unsigned char *buf, int len)
+unsigned long mpc_crc32(unsigned char *buf, int len)
 {
         return update_crc(0xffffffffL, buf, len) ^ 0xffffffffL;

libmpc/trunk/libmpcdec/streaminfo.c

@@ -43 +43 @@
 #include "mpc_bits_reader.h"
 
-unsigned long crc32(unsigned char *buf, int len);
+unsigned long mpc_crc32(unsigned char *buf, int len);
 
 static const char na[] = "n.a.";
@@ -191 +191 @@
 
         CRC = (mpc_bits_read(&r, 16) << 16) | mpc_bits_read(&r, 16);
-        if (CRC != crc32(r.buff + 1 - (r.count >> 3), (int)block_size - 4))
+        if (CRC != mpc_crc32(r.buff + 1 - (r.count >> 3), (int)block_size - 4))
                 return MPC_STATUS_FILE;
 

libmpc/trunk/libmpcenc/bitstream.c

@@ -29 +29 @@
 #include "stdio.h"
 
-unsigned long crc32(unsigned char *buf, int len);
+unsigned long mpc_crc32(unsigned char *buf, int len);
 
 #define MAX_ENUM 32
@@ -207 +207 @@
         if (addCRC) {
                 char tmp[4];
-                unsigned long CRC32 = crc32((unsigned char *) e->buffer, e->pos);
+                unsigned long CRC32 = mpc_crc32((unsigned char *) e->buffer, e->pos);
                 tmp[0] = (char) (CRC32 >> 24);
                 tmp[1] = (char) (CRC32 >> 16);