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

msvc buildfix

This commit is contained in:
Brad Parker 2017-03-04 22:14:22 -05:00
parent bf553fe65c
commit bd6ca986d8
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
griffin/griffin.c
View File

@ -905,10 +905,12 @@ NETPLAY
#include "../network/netplay/netplay_sync.c" #include "../network/netplay/netplay_sync.c"
#include "../network/netplay/netplay_discovery.c" #include "../network/netplay/netplay_discovery.c"
#include "../network/netplay/netplay_buf.c" #include "../network/netplay/netplay_buf.c"
#include "../network/netplay/netplay_room_parse.c"
#include "../libretro-common/net/net_compat.c" #include "../libretro-common/net/net_compat.c"
#include "../libretro-common/net/net_socket.c" #include "../libretro-common/net/net_socket.c"
#include "../libretro-common/net/net_http.c" #include "../libretro-common/net/net_http.c"
#include "../libretro-common/net/net_natt.c" #include "../libretro-common/net/net_natt.c"
#include "../libretro-common/formats/json/jsonsax_full.c"
#ifndef HAVE_SOCKET_LEGACY #ifndef HAVE_SOCKET_LEGACY
#include "../libretro-common/net/net_ifinfo.c" #include "../libretro-common/net/net_ifinfo.c"
#endif #endif

2
libretro-common/formats/json/jsonsax_full.c
View File

@ -1490,7 +1490,7 @@ static JSON_Status JSON_Parser_HandleInvalidEncodingSequence(JSON_Parser parser,
instead of an invalid sequence. If the content is valid, instead of an invalid sequence. If the content is valid,
this will fail with JSON_Error_StoppedAfterEmbeddedDocument; this will fail with JSON_Error_StoppedAfterEmbeddedDocument;
otherwise, it will fail with an appropriate error. */ otherwise, it will fail with an appropriate error. */
return JSON_Parser_FlushLexer(parser) && JSON_Parser_FlushParser(parser); return (JSON_Status)(JSON_Parser_FlushLexer(parser) && JSON_Parser_FlushParser(parser));
} }
JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_InvalidEncodingSequence); JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_InvalidEncodingSequence);
return JSON_Failure; return JSON_Failure;