ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix MSVC compilation

This commit is contained in:
Spec-Chum 2016-12-03 18:24:49 +00:00
parent 37d129a13d
commit 7a6a0ee7af
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/drivers_font/d3d_w32_font.cpp
View File

@ -46,7 +46,11 @@ static void *d3dfonts_w32_init_font(void *video_data,
OUT_TT_PRECIS, OUT_TT_PRECIS,
CLIP_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
DEFAULT_PITCH, 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)); d3dfonts = (d3dfonts_t*)calloc(1, sizeof(*d3dfonts));

2
network/netplay/netplay_discovery.c
View File

@ -125,7 +125,7 @@ bool netplay_discovery_driver_ctl(enum rarch_netplay_discovery_ctl_state state,
/* Make it broadcastable */ /* Make it broadcastable */
#if defined(SOL_SOCKET) && defined(SO_BROADCAST) #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 #endif
/* Put together the request */ /* Put together the request */