mirror of
https://github.com/libretro/RetroArch.git
synced 2024-11-27 02:00:41 +00:00
Fix C89_BUILD
This commit is contained in:
parent
95f734fade
commit
a0dc153508
@ -229,7 +229,6 @@ static bool wasapi_is_format_suitable(const WAVEFORMATEXTENSIBLE *format)
|
||||
static bool wasapi_select_device_format(WAVEFORMATEXTENSIBLE *format, IAudioClient *client, AUDCLNT_SHAREMODE mode, unsigned channels)
|
||||
{
|
||||
static const unsigned preferred_rates[] = { 48000, 44100, 96000, 192000, 32000 };
|
||||
const bool preferred_formats[] = {format->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE, format->Format.wFormatTag != WAVE_FORMAT_EXTENSIBLE};
|
||||
/* Try the requested sample format first, then try the other one. */
|
||||
WAVEFORMATEXTENSIBLE *suggested_format = NULL;
|
||||
bool result = false;
|
||||
@ -267,8 +266,11 @@ static bool wasapi_select_device_format(WAVEFORMATEXTENSIBLE *format, IAudioClie
|
||||
* Usually happens with exclusive mode.
|
||||
* RetroArch will try selecting a format. */
|
||||
size_t i, j;
|
||||
bool preferred_formats[2];
|
||||
WAVEFORMATEXTENSIBLE possible_format;
|
||||
HRESULT format_check_hr;
|
||||
preferred_formats[0] = (format->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE);
|
||||
preferred_formats[1] = (format->Format.wFormatTag != WAVE_FORMAT_EXTENSIBLE);
|
||||
RARCH_WARN("[WASAPI]: Requested format not supported, and Windows could not suggest one. RetroArch will do so.\n");
|
||||
for (i = 0; i < ARRAY_SIZE(preferred_formats); ++i)
|
||||
{
|
||||
|
6
deps/xdelta3/xdelta3.h
vendored
6
deps/xdelta3/xdelta3.h
vendored
@ -184,12 +184,6 @@ typedef ULONGLONG uint64_t;
|
||||
#define _FILE_OFFSET_BITS 64
|
||||
#endif
|
||||
|
||||
_Static_assert(SIZEOF_SIZE_T == sizeof(size_t), "SIZEOF_SIZE_T not correctly set");
|
||||
|
||||
#ifdef SIZEOF_UNSIGNED_LONG_LONG
|
||||
_Static_assert(SIZEOF_UNSIGNED_LONG_LONG == sizeof(unsigned long long), "SIZEOF_UNSIGNED_LONG_LONG not correctly set");
|
||||
#endif
|
||||
|
||||
/* Set a xoff_t typedef and the "Q" printf insert. */
|
||||
typedef uint64_t xoff_t;
|
||||
#define Q "ll"
|
||||
|
@ -813,7 +813,7 @@ static void gfx_ctx_wgl_set_flags(void *data, uint32_t flags)
|
||||
static void gfx_ctx_wgl_get_video_output_prev(void *data) { }
|
||||
static void gfx_ctx_wgl_get_video_output_next(void *data) { }
|
||||
|
||||
//TODO: maybe create an uwp_mesa_common.c?
|
||||
/* TODO: maybe create an uwp_mesa_common.c? */
|
||||
#ifdef __WINRT__
|
||||
|
||||
static void win32_get_video_size(void* data,
|
||||
@ -851,16 +851,9 @@ HWND win32_get_window(void)
|
||||
/* TODO/FIXME - static globals */
|
||||
uint8_t g_win32_flags = 0;
|
||||
|
||||
uint8_t win32_get_flags(void)
|
||||
{
|
||||
return g_win32_flags;
|
||||
}
|
||||
|
||||
void win32_setup_pixel_format(HDC hdc, bool supports_gl)
|
||||
{
|
||||
//NTD, already done by mesa
|
||||
}
|
||||
|
||||
uint8_t win32_get_flags(void) { return g_win32_flags; }
|
||||
/* NTD, already done by mesa */
|
||||
void win32_setup_pixel_format(HDC hdc, bool supports_gl) { }
|
||||
#endif
|
||||
|
||||
const gfx_ctx_driver_t gfx_ctx_wgl = {
|
||||
|
Loading…
Reference in New Issue
Block a user