X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fcdrcimg%2Fcdrcimg.c;h=91cf1cad1795976b0c3a10207f1824df4b6191af;hp=dd1cf57bca84769aa6e8d71f40838f8b17ede44e;hb=HEAD;hpb=bb5cf0fcf7abafa7648734696320d5fa3bdb1e0a

diff --git a/plugins/cdrcimg/cdrcimg.c b/plugins/cdrcimg/cdrcimg.c
index dd1cf57b..b3bee271 100644
--- a/plugins/cdrcimg/cdrcimg.c
+++ b/plugins/cdrcimg/cdrcimg.c
@@ -12,11 +12,15 @@
 #include <string.h>
 #include <stdlib.h>
 #include <zlib.h>
-#include <bzlib.h>
+#if !defined(_WIN32) && !defined(NO_DYLIB)
 #include <dlfcn.h>
+#endif
 
 #include "cdrcimg.h"
 
+#undef CALLBACK
+#define CALLBACK
+
 #define PFX "cdrcimg: "
 #define err(f, ...) fprintf(stderr, PFX f, ##__VA_ARGS__)
 
@@ -45,12 +49,12 @@ static struct {
 static int current_block, current_sect_in_blk;
 
 struct CdrStat;
-extern long CDR__getStatus(struct CdrStat *stat);
+extern long CALLBACK CDR__getStatus(struct CdrStat *stat);
 
 struct CdrStat
 {
-	unsigned long Type;
-	unsigned long Status;
+	unsigned int Type;
+	unsigned int Status;
 	unsigned char Time[3]; // current playing time
 };
 
@@ -93,7 +97,7 @@ static long CDRgetTD(unsigned char track, unsigned char *buffer)
 	return 0;
 }
 
-int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size)
+static int uncompress2_pcsx(void *out, unsigned long *out_size, void *in, unsigned long in_size)
 {
 	static z_stream z;
 	int ret = 0;
@@ -194,7 +198,7 @@ static long CDRreadTrack(unsigned char *time)
 		ret = uncompress(cdbuffer->raw[0], &cdbuffer_size, cdbuffer->compressed, size);
 		break;
 	case CDRC_ZLIB2:
-		ret = uncompress2(cdbuffer->raw[0], &cdbuffer_size, cdbuffer->compressed, size);
+		ret = uncompress2_pcsx(cdbuffer->raw[0], &cdbuffer_size, cdbuffer->compressed, size);
 		break;
 	case CDRC_BZ:
 		ret = pBZ2_bzBuffToBuffDecompress((char *)cdbuffer->raw, (unsigned int *)&cdbuffer_size,
@@ -212,7 +216,7 @@ static long CDRreadTrack(unsigned char *time)
 	}
 	if (cdbuffer_size != sizeof(cdbuffer->raw[0]) * cd_sectors_per_blk)
 		err("cdbuffer_size: %lu != %d, sector %d\n", cdbuffer_size,
-			sizeof(cdbuffer->raw[0]) * cd_sectors_per_blk, sector);
+			(int)sizeof(cdbuffer->raw[0]) * cd_sectors_per_blk, sector);
 
 	// done at last!
 	current_block = block;
@@ -280,6 +284,7 @@ static long CDRinit(void)
 			return -1;
 		}
 	}
+#if !defined(_WIN32) && !defined(NO_DYLIB)
 	if (pBZ2_bzBuffToBuffDecompress == NULL) {
 		void *h = dlopen("/usr/lib/libbz2.so.1", RTLD_LAZY);
 		if (h == NULL)
@@ -292,6 +297,7 @@ static long CDRinit(void)
 			}
 		}
 	}
+#endif
 	return 0;
 }