Merge pull request #3781 from frangarcj/master

(VITA) Working scanning content
This commit is contained in:
Francisco José García García 2016-10-13 17:51:13 +01:00 committed by GitHub
commit 8e329a2072
2 changed files with 4 additions and 2 deletions

View File

@ -79,7 +79,7 @@ typedef int ssize_t;
#define STRING_REP_INT64 "%I64u"
#define STRING_REP_UINT64 "%I64u"
#define STRING_REP_ULONG "%Iu"
#elif defined(__STDC_VERSION__) && __STDC_VERSION__>=199901L
#elif defined(__STDC_VERSION__) && __STDC_VERSION__>=199901L && !defined(VITA)
#define STRING_REP_INT64 "%llu"
#define STRING_REP_UINT64 "%llu"
#define STRING_REP_ULONG "%zu"

View File

@ -51,13 +51,15 @@ typedef struct db_handle
static int task_database_iterate_start(database_info_handle_t *db,
const char *name)
{
char msg[128];
msg[0] = msg[127] = '\0';
snprintf(msg, sizeof(msg),
STRING_REP_ULONG "/" STRING_REP_ULONG ": %s %s...\n",
#if defined(_WIN32) || defined(__STDC_VERSION__) && __STDC_VERSION__>=199901L
#if defined(_WIN32) || defined(__STDC_VERSION__) && __STDC_VERSION__>=199901L && !defined(VITA)
db->list_ptr,
db->list->size,
#else