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
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
e327500
..
2254516
100644
(file)
--- a/
plugins/cdrcimg/cdrcimg.c
+++ b/
plugins/cdrcimg/cdrcimg.c
@@
-12,11
+12,15
@@
#include <string.h>
#include <stdlib.h>
#include <zlib.h>
#include <string.h>
#include <stdlib.h>
#include <zlib.h>
-#i
nclude <bzlib.h>
+#i
f !defined(_WIN32) && !defined(NO_DYLIB)
#include <dlfcn.h>
#include <dlfcn.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__)
@@
-45,12
+49,12
@@
static struct {
static int current_block, current_sect_in_blk;
struct CdrStat;
static int current_block, current_sect_in_blk;
struct CdrStat;
-extern long CDR__getStatus(struct CdrStat *stat);
+extern long C
ALLBACK C
DR__getStatus(struct CdrStat *stat);
struct CdrStat
{
struct CdrStat
{
- unsigned
long
Type;
- unsigned
long
Status;
+ unsigned
int
Type;
+ unsigned
int
Status;
unsigned char Time[3]; // current playing time
};
unsigned char Time[3]; // current playing time
};
@@
-93,7
+97,7
@@
static long CDRgetTD(unsigned char track, unsigned char *buffer)
return 0;
}
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;
{
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 = 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,
break;
case CDRC_BZ:
ret = pBZ2_bzBuffToBuffDecompress((char *)cdbuffer->raw, (unsigned int *)&cdbuffer_size,
@@
-280,6
+284,7
@@
static long CDRinit(void)
return -1;
}
}
return -1;
}
}
+#ifndef _WIN32
if (pBZ2_bzBuffToBuffDecompress == NULL) {
void *h = dlopen("/usr/lib/libbz2.so.1", RTLD_LAZY);
if (h == NULL)
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;
}
return 0;
}