From 7a6a0ee7af7d0f265cb80851d0558f3053e5a008 Mon Sep 17 00:00:00 2001 From: Spec-Chum Date: Sat, 3 Dec 2016 18:24:49 +0000 Subject: [PATCH] Fix MSVC compilation --- gfx/drivers_font/d3d_w32_font.cpp | 6 +++++- network/netplay/netplay_discovery.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gfx/drivers_font/d3d_w32_font.cpp b/gfx/drivers_font/d3d_w32_font.cpp index bf831d08d5..df4e86a6f2 100644 --- a/gfx/drivers_font/d3d_w32_font.cpp +++ b/gfx/drivers_font/d3d_w32_font.cpp @@ -46,7 +46,11 @@ static void *d3dfonts_w32_init_font(void *video_data, OUT_TT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_PITCH, - "Verdana" /* Hardcode FTL */ +#ifdef _MSC_VER /* MSVC needs w_char* */ + L"Verdana" /* Hardcode FTL */ +#else + "Veranda" +#endif }; d3dfonts = (d3dfonts_t*)calloc(1, sizeof(*d3dfonts)); diff --git a/network/netplay/netplay_discovery.c b/network/netplay/netplay_discovery.c index 99c277c4fd..74bee51675 100644 --- a/network/netplay/netplay_discovery.c +++ b/network/netplay/netplay_discovery.c @@ -125,7 +125,7 @@ bool netplay_discovery_driver_ctl(enum rarch_netplay_discovery_ctl_state state, /* Make it broadcastable */ #if defined(SOL_SOCKET) && defined(SO_BROADCAST) - setsockopt(lan_ad_client_fd, SOL_SOCKET, SO_BROADCAST, (void *) &canBroadcast, sizeof(canBroadcast)); + setsockopt(lan_ad_client_fd, SOL_SOCKET, SO_BROADCAST, (const char *) &canBroadcast, sizeof(canBroadcast)); #endif /* Put together the request */