summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2012-02-29 09:13:22 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2012-02-29 09:13:22 +0000
commitbef76826c9ec14aa4f08da532bc01f6411efa011 (patch)
tree8106f9e2432368bd90d7d7969e75b578c6f13e89 /src/lib
parentc33fba77f0d07abf1c48cd9393596dd63fe22815 (diff)
fixed several Visual Studio compiler warnings and 64-bit libflac compilation by Firewave, and idectrl change from Carl (no whatsnew)
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/formats/ap_dsk35.c2
-rw-r--r--src/lib/lib7z/CpuArch.h1
-rw-r--r--src/lib/libflac/libflac/bitreader.c4
-rw-r--r--src/lib/util/chdcd.c4
4 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/formats/ap_dsk35.c b/src/lib/formats/ap_dsk35.c
index 4a3e78363fa..a78c494328b 100644
--- a/src/lib/formats/ap_dsk35.c
+++ b/src/lib/formats/ap_dsk35.c
@@ -1300,7 +1300,7 @@ bool dc42_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
UINT8 format = h[0x51];
if((encoding != 0x00 || format != 0x02) && (encoding != 0x01 || format != 0x22)) {
- logerror("dc42: Unsupported encoding/format combination %02x\%02x\n", encoding, format);
+ logerror("dc42: Unsupported encoding/format combination %02x/%02x\n", encoding, format);
return false;
}
diff --git a/src/lib/lib7z/CpuArch.h b/src/lib/lib7z/CpuArch.h
index b7e6c7ea71c..f424502f473 100644
--- a/src/lib/lib7z/CpuArch.h
+++ b/src/lib/lib7z/CpuArch.h
@@ -98,6 +98,7 @@ Stop_Compiling_Bad_Endian
#endif
#if defined(MY_CPU_LE_UNALIGN) && defined(_WIN64) && (_MSC_VER >= 1300)
+#include <stdlib.h>
#pragma intrinsic(_byteswap_ulong)
#pragma intrinsic(_byteswap_uint64)
diff --git a/src/lib/libflac/libflac/bitreader.c b/src/lib/libflac/libflac/bitreader.c
index 02e4d4ba4b0..6e15c18f3ce 100644
--- a/src/lib/libflac/libflac/bitreader.c
+++ b/src/lib/libflac/libflac/bitreader.c
@@ -149,7 +149,7 @@ static FLAC__uint32 local_swap32_(FLAC__uint32 x)
return (x>>16) | (x<<16);
}
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && defined(_M_IX86)
/* OPT: an MSVC built-in would be better */
static void local_swap32_block_(FLAC__uint32 *start, FLAC__uint32 len)
{
@@ -258,7 +258,7 @@ FLAC__bool bitreader_read_from_client_(FLAC__BitReader *br)
#if WORDS_BIGENDIAN
#else
end = (br->words*FLAC__BYTES_PER_WORD + br->bytes + bytes + (FLAC__BYTES_PER_WORD-1)) / FLAC__BYTES_PER_WORD;
-# if defined(_MSC_VER) && (FLAC__BYTES_PER_WORD == 4)
+# if defined(_MSC_VER) && (FLAC__BYTES_PER_WORD == 4) && defined(_M_IX86)
if(br->cpu_info.type == FLAC__CPUINFO_TYPE_IA32 && br->cpu_info.data.ia32.bswap) {
start = br->words;
local_swap32_block_(br->buffer + start, end - start);
diff --git a/src/lib/util/chdcd.c b/src/lib/util/chdcd.c
index aaad58fd7b0..49eed70fce6 100644
--- a/src/lib/util/chdcd.c
+++ b/src/lib/util/chdcd.c
@@ -301,7 +301,7 @@ UINT64 read_uint64(FILE *infile)
}
/*-------------------------------------------------
- chdcd_parse_toc - parse a CDRWin format CUE file
+ chdcd_parse_nero - parse a Nero format image file
-------------------------------------------------*/
chd_error chdcd_parse_nero(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo)
@@ -579,7 +579,7 @@ static chd_error chdcd_parse_gdi(const char *tocfname, cdrom_toc &outtoc, chdcd_
}
/*-------------------------------------------------
- chdcd_parse_toc - parse a CDRWin format CUE file
+ chdcd_parse_cue - parse a CDRWin format CUE file
-------------------------------------------------*/
chd_error chdcd_parse_cue(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo)