From ac949a14bfde90c85c057c56f71fae3d91d8e361 Mon Sep 17 00:00:00 2001
From: Brad Parker <cbparker@gmail.com>
Date: Thu, 7 Sep 2017 02:02:43 -0400
Subject: [PATCH] msvc2003 buildfixes
---
libretro-common/encodings/encoding_crc32.c | 1 +
libretro-common/hash/rhash.c | 4 ++--
libretro-common/include/encodings/crc32.h | 1 -
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libretro-common/encodings/encoding_crc32.c b/libretro-common/encodings/encoding_crc32.c
index aa10d1a241..0c1895a98f 100644
--- a/libretro-common/encodings/encoding_crc32.c
+++ b/libretro-common/encodings/encoding_crc32.c
@@ -22,6 +22,7 @@
#include <stdint.h>
#include <stddef.h>
+#include <encodings/crc32.h>
static const uint32_t crc32_table[256] = {
0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
diff --git a/libretro-common/hash/rhash.c b/libretro-common/hash/rhash.c
index 8eb2bb58d7..3d4aa1ca5d 100644
--- a/libretro-common/hash/rhash.c
+++ b/libretro-common/hash/rhash.c
@@ -201,7 +201,7 @@ void sha256_hash(char *s, const uint8_t *in, size_t size)
#ifndef HAVE_ZLIB
/* Zlib CRC32. */
-static const uint32_t crc32_table[256] = {
+static const uint32_t crc32_hash_table[256] = {
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
@@ -249,7 +249,7 @@ static const uint32_t crc32_table[256] = {
uint32_t crc32_adjust(uint32_t checksum, uint8_t input)
{
- return ((checksum >> 8) & 0x00ffffff) ^ crc32_table[(checksum ^ input) & 0xff];
+ return ((checksum >> 8) & 0x00ffffff) ^ crc32_hash_table[(checksum ^ input) & 0xff];
}
uint32_t crc32_calculate(const uint8_t *data, size_t length)
diff --git a/libretro-common/include/encodings/crc32.h b/libretro-common/include/encodings/crc32.h
index d1973e40a6..0c9947629d 100644
--- a/libretro-common/include/encodings/crc32.h
+++ b/libretro-common/include/encodings/crc32.h
@@ -30,7 +30,6 @@
RETRO_BEGIN_DECLS
-
uint32_t encoding_crc32(uint32_t crc, const uint8_t *buf, size_t len);
RETRO_END_DECLS