libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 06:41:51 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed MSVC warnings

Browse Source 
svn-id: r32474
This commit is contained in:
Filippos Karapetis 2008-06-01 20:05:21 +00:00
parent 49dd9376ad
commit f5d9eb32f0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/unarj.cpp
View File

@ -550,7 +550,7 @@ void ArjFile::decode() {
r = 0;
while (count < _origsize) {
if ((c = decode_c()) <= UCHAR_MAX) {
if ((c = decode_c()) <= ARJ_UCHAR_MAX) {
_text[r] = (byte) c;
count++;
if (++r >= DDICSIZ) {
@ -558,7 +558,7 @@ void ArjFile::decode() {
_outstream->write(_text, DDICSIZ);
}
} else {
j = c - (UCHAR_MAX + 1 - THRESHOLD);
j = c - (ARJ_UCHAR_MAX + 1 - THRESHOLD);
count += j;
i = decode_p();
if ((i = r - i - 1) < 0)
@ -591,7 +591,7 @@ void ArjFile::decode() {
#define GETBITS(c,l) {if(_getlen<l)BFIL c=(uint16)_getbuf>>(CODE_BIT-l);BPUL(l)}
int16 ArjFile::decode_ptr() {
int16 c;
int16 c = 0;
int16 width;
int16 plus;
int16 pwr;
@ -612,7 +612,7 @@ int16 ArjFile::decode_ptr() {
}
int16 ArjFile::decode_len() {
int16 c;
int16 c = 0;
int16 width;
int16 plus;
int16 pwr;

4
common/unarj.h
View File

@ -44,13 +44,13 @@ namespace Common {
#define CODE_BIT 16
#define CHAR_BIT 8
#define UCHAR_MAX 255
#define ARJ_UCHAR_MAX 255 // UCHAR_MAX is defined in limits.h in MSVC
#define THRESHOLD 3
#define DDICSIZ 26624
#define MAXDICBIT 16
#define MATCHBIT 8
#define MAXMATCH 256
#define NC (UCHAR_MAX + MAXMATCH + 2 - THRESHOLD)
#define NC (ARJ_UCHAR_MAX + MAXMATCH + 2 - THRESHOLD)
#define NP (MAXDICBIT + 1)
#define CBIT 9
#define NT (CODE_BIT + 3)