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
Update psxmem.c
[pcsx_rearmed.git]
/
plugins
/
cdrcimg
/
cdrcimg.c
diff --git
a/plugins/cdrcimg/cdrcimg.c
b/plugins/cdrcimg/cdrcimg.c
index
036c68d
..
f1e0777
100644
(file)
--- a/
plugins/cdrcimg/cdrcimg.c
+++ b/
plugins/cdrcimg/cdrcimg.c
@@
-14,7
+14,7
@@
#include <zlib.h>
#ifndef _WIN32
#define CALLBACK
#include <zlib.h>
#ifndef _WIN32
#define CALLBACK
-#ifndef
_3DS
+#ifndef
NO_DYLIB
#include <dlfcn.h>
#endif
#else
#include <dlfcn.h>
#endif
#else
@@
-100,7
+100,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;
@@
-201,7
+201,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,
@@
-287,7
+287,7
@@
static long CDRinit(void)
return -1;
}
}
return -1;
}
}
-#if !defined(_WIN32) && !defined(
_3DS
)
+#if !defined(_WIN32) && !defined(
NO_DYLIB
)
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)