plugins: try to untangle the CALLBACK mess

[pcsx_rearmed.git] / plugins / cdrcimg / cdrcimg.c

diff --git a/plugins/cdrcimg/cdrcimg.c b/plugins/cdrcimg/cdrcimg.c
index 007e96b..047357a 100644 (file)
--- a/plugins/cdrcimg/cdrcimg.c
+++ b/plugins/cdrcimg/cdrcimg.c
@@ -8,24 +8,19 @@
  * See the COPYING file in the top-level directory.
  */
 
-#include <compat/fopen_utf8.h>
-
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <zlib.h>
-#ifndef _WIN32
-#define CALLBACK
-#ifndef NO_DYLIB
+#if !defined(_WIN32) && !defined(NO_DYLIB)
 #include <dlfcn.h>
 #endif
-#else
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#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);
@@ -419,6 +414,8 @@ static long CDRopen(void)
        char *ext;
        FILE *f = NULL;
 
+       printf("%s cd_file=%d\n", __func__, cd_file == NULL ? 0 : 1);
+
        if (cd_file != NULL)
                return 0; // it's already open
 
@@ -462,7 +459,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 +524,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);