mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 12:40:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

More C89_BUILD buildfixes

Browse Source
This commit is contained in:
Twinaphex 2015-11-19 13:43:48 +01:00
parent 8c66106ee7
commit 1cd1ecfc5c
2 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libretro-db/query.c
View File

@ -151,28 +151,34 @@ static void raise_unknown_function(ssize_t where, const char *name,
} }
static void raise_expected_eof(ssize_t where, char found, const char **error) static void raise_expected_eof(ssize_t where, char found, const char **error)
{ {
snprintf(tmp_error_buff, MAX_ERROR_LEN,
#ifdef _WIN32 #ifdef _WIN32
snprintf(tmp_error_buff, MAX_ERROR_LEN,
"%I64u::Expected EOF found '%c'", "%I64u::Expected EOF found '%c'",
#else
"%llu::Expected EOF found '%c'",
#endif
(unsigned long long)where, (unsigned long long)where,
found found
); );
#else
snprintf(tmp_error_buff, MAX_ERROR_LEN,
"%llu::Expected EOF found '%c'",
(unsigned long long)where,
found
);
#endif
*error = tmp_error_buff; *error = tmp_error_buff;
} }
static void raise_unexpected_char(ssize_t where, char expected, char found, static void raise_unexpected_char(ssize_t where, char expected, char found,
const char **error) const char **error)
{ {
snprintf(tmp_error_buff, MAX_ERROR_LEN,
#ifdef _WIN32 #ifdef _WIN32
snprintf(tmp_error_buff, MAX_ERROR_LEN,
"%I64u::Expected '%c' found '%c'", "%I64u::Expected '%c' found '%c'",
#else
"%llu::Expected '%c' found '%c'",
#endif
(unsigned long long)where, expected, found); (unsigned long long)where, expected, found);
#else
snprintf(tmp_error_buff, MAX_ERROR_LEN,
"%llu::Expected '%c' found '%c'",
(unsigned long long)where, expected, found);
#endif
*error = tmp_error_buff; *error = tmp_error_buff;
} }
@ -577,13 +583,15 @@ static struct buffer parse_integer(struct buffer buff,
{ {
value->type = RDT_INT; value->type = RDT_INT;
if (sscanf(buff.data + buff.offset,
#ifdef _WIN32 #ifdef _WIN32
if (sscanf(buff.data + buff.offset,
"%I64d", "%I64d",
#else
"%lld",
#endif
(signed long long*)&value->val.int_) == 0) (signed long long*)&value->val.int_) == 0)
#else
if (sscanf(buff.data + buff.offset,
"%lld",
(signed long long*)&value->val.int_) == 0)
#endif
raise_expected_number(buff.offset, error); raise_expected_number(buff.offset, error);
else else
{ {

13
tasks/task_database.c
View File

@ -100,16 +100,21 @@ static int database_info_iterate_start
{ {
char msg[PATH_MAX_LENGTH] = {0}; char msg[PATH_MAX_LENGTH] = {0};
snprintf(msg, sizeof(msg),
#ifdef _WIN32 #ifdef _WIN32
snprintf(msg, sizeof(msg),
"%Iu/%Iu: %s %s...\n", "%Iu/%Iu: %s %s...\n",
#else
"%zu/%zu: %s %s...\n",
#endif
db->list_ptr, db->list_ptr,
db->list->size, db->list->size,
msg_hash_to_str(MSG_SCANNING), msg_hash_to_str(MSG_SCANNING),
name); name);
#else
snprintf(msg, sizeof(msg),
"%zu/%zu: %s %s...\n",
db->list_ptr,
db->list->size,
msg_hash_to_str(MSG_SCANNING),
name);
#endif
if (msg[0] != '\0') if (msg[0] != '\0')
rarch_main_msg_queue_push(msg, 1, 180, true); rarch_main_msg_queue_push(msg, 1, 180, true);