diff options
| author | notaz | 2015-01-25 23:21:40 +0200 |
|---|---|---|
| committer | notaz | 2015-01-25 23:21:40 +0200 |
| commit | 4e9adec1930817da2031fd044dc74c0f454a0079 (patch) | |
| tree | 854c202544c75e486d4243b34366162f03f082eb /plugins/cdrcimg/cdrcimg.c | |
| parent | be1294d017cba3f18cf66597f0cbed207fed26bf (diff) | |
| parent | ba10822d813767632c528102055e3eeb54730b2c (diff) | |
| download | pcsx_rearmed-4e9adec1930817da2031fd044dc74c0f454a0079.tar.gz pcsx_rearmed-4e9adec1930817da2031fd044dc74c0f454a0079.tar.bz2 pcsx_rearmed-4e9adec1930817da2031fd044dc74c0f454a0079.zip | |
Merge branch 'upstream' into libretro
Diffstat (limited to 'plugins/cdrcimg/cdrcimg.c')
| -rw-r--r-- | plugins/cdrcimg/cdrcimg.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/plugins/cdrcimg/cdrcimg.c b/plugins/cdrcimg/cdrcimg.c index 0ec14db..76cdfba 100644 --- a/plugins/cdrcimg/cdrcimg.c +++ b/plugins/cdrcimg/cdrcimg.c @@ -12,7 +12,13 @@ #include <string.h> #include <stdlib.h> #include <zlib.h> +#ifndef _WIN32 +#define CALLBACK #include <dlfcn.h> +#else +#define WIN32_LEAN_AND_MEAN +#include <windows.h> +#endif #include "cdrcimg.h" @@ -44,7 +50,7 @@ static struct { static int current_block, current_sect_in_blk; struct CdrStat; -extern long CDR__getStatus(struct CdrStat *stat); +extern long CALLBACK CDR__getStatus(struct CdrStat *stat); struct CdrStat { @@ -279,6 +285,7 @@ static long CDRinit(void) return -1; } } +#ifndef _WIN32 if (pBZ2_bzBuffToBuffDecompress == NULL) { void *h = dlopen("/usr/lib/libbz2.so.1", RTLD_LAZY); if (h == NULL) @@ -291,6 +298,7 @@ static long CDRinit(void) } } } +#endif return 0; } |