X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=plugins%2Fcdrcimg%2Fcdrcimg.c;h=76cdfbaa8bafd87b86e600375bceceacdf42234f;hb=e541b8e06ff03a7fe7bd75b1bc0ad53f60b2d0de;hp=e327500114cde624c9f2b9524b59179aa81de420;hpb=c979c3ee0d0bc6bece799a6f4013993d7cb2d5f3;p=pcsx_rearmed.git diff --git a/plugins/cdrcimg/cdrcimg.c b/plugins/cdrcimg/cdrcimg.c index e3275001..76cdfbaa 100644 --- a/plugins/cdrcimg/cdrcimg.c +++ b/plugins/cdrcimg/cdrcimg.c @@ -12,8 +12,13 @@ #include #include #include -#include +#ifndef _WIN32 +#define CALLBACK #include +#else +#define WIN32_LEAN_AND_MEAN +#include +#endif #include "cdrcimg.h" @@ -45,12 +50,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 }; @@ -280,6 +285,7 @@ static long CDRinit(void) return -1; } } +#ifndef _WIN32 if (pBZ2_bzBuffToBuffDecompress == NULL) { void *h = dlopen("/usr/lib/libbz2.so.1", RTLD_LAZY); if (h == NULL) @@ -292,6 +298,7 @@ static long CDRinit(void) } } } +#endif return 0; }