From fcbaca9b664025f81373a0ca5e71a9c40d3c98c9 Mon Sep 17 00:00:00 2001 From: Alcaro Date: Sun, 6 Sep 2015 15:29:38 +0200 Subject: [PATCH] Fix a dozen CXX_BUILD errors under Windows. --- audio/drivers/dsound.c | 12 +++--- input/autoconf/builtin_ctr.c | 1 + input/autoconf/builtin_gx.c | 1 + input/autoconf/builtin_ps3.c | 1 + input/autoconf/builtin_psp.c | 1 + input/autoconf/builtin_win.c | 1 + input/autoconf/builtin_xdk.c | 1 + libretro-common/dynamic/dylib.c | 1 + libretro-common/file/retro_dirent.c | 43 ++++++++++--------- libretro-common/gfx/scaler/scaler_filter.c | 3 ++ libretro-common/include/compat/posix_string.h | 14 +----- 11 files changed, 40 insertions(+), 39 deletions(-) diff --git a/audio/drivers/dsound.c b/audio/drivers/dsound.c index 3ad4d5fda6..10855c7b38 100644 --- a/audio/drivers/dsound.c +++ b/audio/drivers/dsound.c @@ -69,7 +69,7 @@ static INLINE unsigned write_avail(unsigned read_ptr, unsigned write_ptr, unsign return (read_ptr + buffer_size - write_ptr) % buffer_size; } -static INLINE void get_positions(dsound_t *ds, uint32_t *read_ptr, uint32_t *write_ptr) +static INLINE void get_positions(dsound_t *ds, DWORD *read_ptr, DWORD *write_ptr) { IDirectSoundBuffer_GetCurrentPosition(ds->dsb, read_ptr, write_ptr); } @@ -80,8 +80,8 @@ struct audio_lock { void *chunk1; void *chunk2; - uint32_t size1; - uint32_t size2; + DWORD size1; + DWORD size2; }; static INLINE bool grab_region(dsound_t *ds, uint32_t write_ptr, @@ -133,7 +133,7 @@ static INLINE void release_region(dsound_t *ds, const struct audio_lock *region) static void dsound_thread(void *data) { - uint32_t write_ptr; + DWORD write_ptr; dsound_t *ds = (dsound_t*)data; SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_TIME_CRITICAL); @@ -144,7 +144,7 @@ static void dsound_thread(void *data) while (ds->thread_alive) { struct audio_lock region; - uint32_t read_ptr, avail, fifo_avail; + DWORD read_ptr, avail, fifo_avail; get_positions(ds, &read_ptr, NULL); avail = write_avail(read_ptr, write_ptr, ds->buffer_size); @@ -233,7 +233,7 @@ static bool dsound_start_thread(dsound_t *ds) static void dsound_clear_buffer(dsound_t *ds) { void *ptr; - uint32_t size; + DWORD size; IDirectSoundBuffer_SetCurrentPosition(ds->dsb, 0); if (IDirectSoundBuffer_Lock(ds->dsb, 0, 0, &ptr, &size, diff --git a/input/autoconf/builtin_ctr.c b/input/autoconf/builtin_ctr.c index 5a314133dd..a09760ea28 100644 --- a/input/autoconf/builtin_ctr.c +++ b/input/autoconf/builtin_ctr.c @@ -14,6 +14,7 @@ * If not, see . */ +#include "../input_autodetect.h" #include "builtin.h" #define CTRINPUT_DEFAULT_BINDS \ diff --git a/input/autoconf/builtin_gx.c b/input/autoconf/builtin_gx.c index 09dd15c980..fd77138b61 100644 --- a/input/autoconf/builtin_gx.c +++ b/input/autoconf/builtin_gx.c @@ -14,6 +14,7 @@ * If not, see . */ +#include "../input_autodetect.h" #include "builtin.h" #define GXINPUT_GAMECUBE_DEFAULT_BINDS \ diff --git a/input/autoconf/builtin_ps3.c b/input/autoconf/builtin_ps3.c index 3a651c9863..e707064ca4 100644 --- a/input/autoconf/builtin_ps3.c +++ b/input/autoconf/builtin_ps3.c @@ -14,6 +14,7 @@ * If not, see . */ +#include "../input_autodetect.h" #include "builtin.h" #define PS3INPUT_DEFAULT_BINDS \ diff --git a/input/autoconf/builtin_psp.c b/input/autoconf/builtin_psp.c index 93198a1d2d..c6645de059 100644 --- a/input/autoconf/builtin_psp.c +++ b/input/autoconf/builtin_psp.c @@ -14,6 +14,7 @@ * If not, see . */ +#include "../input_autodetect.h" #include "builtin.h" #define PSPINPUT_DEFAULT_BINDS \ diff --git a/input/autoconf/builtin_win.c b/input/autoconf/builtin_win.c index a9252d6201..d9d17cf1e5 100644 --- a/input/autoconf/builtin_win.c +++ b/input/autoconf/builtin_win.c @@ -14,6 +14,7 @@ * If not, see . */ +#include "../input_autodetect.h" #include "builtin.h" #define XINPUT_DEFAULT_BINDS \ diff --git a/input/autoconf/builtin_xdk.c b/input/autoconf/builtin_xdk.c index 0d8c407fd9..2b6be84aaa 100644 --- a/input/autoconf/builtin_xdk.c +++ b/input/autoconf/builtin_xdk.c @@ -14,6 +14,7 @@ * If not, see . */ +#include "../input_autodetect.h" #include "builtin.h" #define XINPUT_DEFAULT_BINDS \ diff --git a/libretro-common/dynamic/dylib.c b/libretro-common/dynamic/dylib.c index 360a19bf29..7c85337cb0 100644 --- a/libretro-common/dynamic/dylib.c +++ b/libretro-common/dynamic/dylib.c @@ -26,6 +26,7 @@ #ifdef NEED_DYNAMIC #ifdef _WIN32 +#include #include #else #include diff --git a/libretro-common/file/retro_dirent.c b/libretro-common/file/retro_dirent.c index aea6bcd60a..fdafe9b6c6 100644 --- a/libretro-common/file/retro_dirent.c +++ b/libretro-common/file/retro_dirent.c @@ -3,29 +3,30 @@ #include #if defined(_WIN32) -#ifdef _MSC_VER -#define setmode _setmode -#endif -#ifdef _XBOX -#include -#define INVALID_FILE_ATTRIBUTES -1 -#else -#include -#include -#include -#include -#endif +# include +# ifdef _MSC_VER +# define setmode _setmode +# endif +# ifdef _XBOX +# include +# define INVALID_FILE_ATTRIBUTES -1 +# else +# include +# include +# include +# include +# endif #elif defined(VITA) -#include -#include +# include +# include #else -#if defined(PSP) -#include -#endif -#include -#include -#include -#include +# if defined(PSP) +# include +# endif +# include +# include +# include +# include #endif #ifdef __CELLOS_LV2__ diff --git a/libretro-common/gfx/scaler/scaler_filter.c b/libretro-common/gfx/scaler/scaler_filter.c index a40bca46b0..3829f3f45d 100644 --- a/libretro-common/gfx/scaler/scaler_filter.c +++ b/libretro-common/gfx/scaler/scaler_filter.c @@ -24,6 +24,9 @@ #include #include #include +#ifndef M_PI +#define M_PI 3.14159265358979323846 +#endif #include #include #include diff --git a/libretro-common/include/compat/posix_string.h b/libretro-common/include/compat/posix_string.h index 61b510cac2..f3157aeece 100644 --- a/libretro-common/include/compat/posix_string.h +++ b/libretro-common/include/compat/posix_string.h @@ -31,18 +31,8 @@ extern "C" { #endif -#undef strcasecmp -#undef strdup -#undef isblank -#undef strtok_r -#define strcasecmp(a, b) rarch_strcasecmp__(a, b) -#define strdup(orig) rarch_strdup__(orig) -#define isblank(c) rarch_isblank__(c) -#define strtok_r(str, delim, saveptr) rarch_strtok_r__(str, delim, saveptr) -int strcasecmp(const char *a, const char *b); -char *strdup(const char *orig); -int isblank(int c); -char *strtok_r(char *str, const char *delim, char **saveptr); +#include +#define snprintf _snprintf #ifdef __cplusplus }