X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=plugins%2Fcdrcimg%2Fcdrcimg.c;h=b3bee271835418dbed636715c890f1cf16185c59;hb=373bac9fe549511c0d2b156e6533dc81dbca1eec;hp=007e96b96d02eccf2bf82197a1920aff3fd2efb2;hpb=270c6dd14f876b8a67929aa22abefc47f4588324;p=pcsx_rearmed.git diff --git a/plugins/cdrcimg/cdrcimg.c b/plugins/cdrcimg/cdrcimg.c index 007e96b9..b3bee271 100644 --- a/plugins/cdrcimg/cdrcimg.c +++ b/plugins/cdrcimg/cdrcimg.c @@ -8,24 +8,19 @@ * See the COPYING file in the top-level directory. */ -#include - #include #include #include #include -#ifndef _WIN32 -#define CALLBACK -#ifndef NO_DYLIB +#if !defined(_WIN32) && !defined(NO_DYLIB) #include #endif -#else -#define WIN32_LEAN_AND_MEAN -#include -#endif #include "cdrcimg.h" +#undef CALLBACK +#define CALLBACK + #define PFX "cdrcimg: " #define err(f, ...) fprintf(stderr, PFX f, ##__VA_ARGS__) @@ -323,7 +318,7 @@ static long handle_eboot(void) int i, ret; FILE *f; - f = fopen_utf8(cd_fname, "rb"); + f = fopen(cd_fname, "rb"); if (f == NULL) { err("missing file: %s: ", cd_fname); perror(NULL); @@ -462,7 +457,7 @@ static long CDRopen(void) return -1; } - f = fopen_utf8(table_fname, "rb"); + f = fopen(table_fname, "rb"); if (f == NULL) { err("missing file: %s: ", table_fname); perror(NULL); @@ -527,7 +522,7 @@ static long CDRopen(void) break; } - cd_file = fopen_utf8(cd_fname, "rb"); + cd_file = fopen(cd_fname, "rb"); if (cd_file == NULL) { err("failed to open: %s: ", table_fname); perror(NULL);