notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gpulib: maybe better loop detection
[pcsx_rearmed.git]
/
plugins
/
cdrcimg
/
cdrcimg.c
diff --git
a/plugins/cdrcimg/cdrcimg.c
b/plugins/cdrcimg/cdrcimg.c
index
007e96b
..
b3bee27
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.
*/
* 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>
#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
#include <dlfcn.h>
#endif
-#else
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
#include "cdrcimg.h"
#include "cdrcimg.h"
+#undef CALLBACK
+#define CALLBACK
+
#define PFX "cdrcimg: "
#define err(f, ...) fprintf(stderr, PFX f, ##__VA_ARGS__)
#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;
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);
if (f == NULL) {
err("missing file: %s: ", cd_fname);
perror(NULL);
@@
-462,7
+457,7
@@
static long CDRopen(void)
return -1;
}
return -1;
}
- f = fopen
_utf8
(table_fname, "rb");
+ f = fopen(table_fname, "rb");
if (f == NULL) {
err("missing file: %s: ", table_fname);
perror(NULL);
if (f == NULL) {
err("missing file: %s: ", table_fname);
perror(NULL);
@@
-527,7
+522,7
@@
static long CDRopen(void)
break;
}
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);
if (cd_file == NULL) {
err("failed to open: %s: ", table_fname);
perror(NULL);