address compiler warnings

cheevos/cheevos.c

@@ -476,7 +476,7 @@ static void rcheevos_award_achievement(const rc_client_achievement_t* cheevo)
          snprintf(shotname, shotname_len, "%s/%s-cheevo-%u",
             settings->paths.directory_screenshot,
             path_basename(path_get(RARCH_PATH_BASENAME)),
-            cheevo->id);
+            (unsigned)cheevo->id);
          shotname[shotname_len - 1] = '\0';
 
          if (take_screenshot(settings->paths.directory_screenshot,
@@ -1210,7 +1210,10 @@ bool rcheevos_unload(void)
 
    if (was_loaded)
    {
+#ifndef HAVE_RC_CLIENT
       unsigned count = 0;
+#endif
+
 #ifdef HAVE_MENU
       rcheevos_menu_reset_badges();
 
@@ -2193,7 +2196,7 @@ static void rcheevos_show_game_placard(void)
    if (summary.num_unsupported_achievements)
    {
       snprintf(unsupported_clause, sizeof(unsupported_clause), " (%d unsupported)",
-         summary.num_unsupported_achievements);
+         (int)summary.num_unsupported_achievements);
    }
 
    /* TODO/FIXME - localize strings */
@@ -2204,22 +2207,22 @@ static void rcheevos_show_game_placard(void)
       else
          snprintf(msg, sizeof(msg),
             "Activated %d unofficial achievements%s.",
-            summary.num_unofficial_achievements,
+            (int)summary.num_unofficial_achievements,
             unsupported_clause);
    }
    else if (rc_client_get_encore_mode_enabled(rcheevos_locals.client))
    {
       snprintf(msg, sizeof(msg),
          "All %d achievements activated for this session%s.",
-         summary.num_core_achievements,
+         (int)summary.num_core_achievements,
          unsupported_clause);
    }
    else
    {
       snprintf(msg, sizeof(msg),
          "You have %d of %d achievements unlocked%s.",
-         summary.num_unlocked_achievements,
-         summary.num_core_achievements,
+         (int)summary.num_unlocked_achievements,
+         (int)summary.num_core_achievements,
          unsupported_clause);
    }
 
@@ -2360,7 +2363,6 @@ static void rcheevos_client_load_game_callback(int result,
    const settings_t* settings = config_get_ptr();
    const rc_client_game_t* game = rc_client_get_game_info(client);
    char msg[256];
-   unsigned subset_id = 0;
 
    if (result != RC_OK || !game)
    {

cheevos/cheevos_locals.h

@@ -246,9 +246,8 @@ rcheevos_locals_t* get_rcheevos_locals(void);
 void rcheevos_begin_load_state(enum rcheevos_load_state state);
 int rcheevos_end_load_state(void);
 bool rcheevos_load_aborted(void);
-#endif
-
 void rcheevos_show_mastery_placard(void);
+#endif
 
 RETRO_END_DECLS
 

cheevos/cheevos_menu.c

@@ -27,6 +27,7 @@
 #include "cheevos.h"
 
 #include "../deps/rcheevos/include/rc_runtime_types.h"
+#include "../deps/rcheevos/include/rc_api_runtime.h"
 
 #include "../menu/menu_driver.h"
 #include "../menu/menu_entries.h"

deps/rcheevos/src/rapi/rc_api_common.c

@@ -18,7 +18,7 @@ static char* g_imagehost = NULL;
 
 /* --- rc_json --- */
 
-static int rc_json_parse_object(rc_json_iterator_t* iterator, rc_json_field_t* fields, size_t field_count, unsigned* fields_seen);
+static int rc_json_parse_object(rc_json_iterator_t* iterator, rc_json_field_t* fields, size_t field_count, uint32_t* fields_seen);
 static int rc_json_parse_array(rc_json_iterator_t* iterator, rc_json_field_t* field);
 
 static int rc_json_match_char(rc_json_iterator_t* iterator, char c)
@@ -182,7 +182,7 @@ static int rc_json_get_next_field(rc_json_iterator_t* iterator, rc_json_field_t*
   return RC_OK;
 }
 
-static int rc_json_parse_object(rc_json_iterator_t* iterator, rc_json_field_t* fields, size_t field_count, unsigned* fields_seen) {
+static int rc_json_parse_object(rc_json_iterator_t* iterator, rc_json_field_t* fields, size_t field_count, uint32_t* fields_seen) {
   size_t i;
   uint32_t num_fields = 0;
   rc_json_field_t field;
@@ -437,14 +437,14 @@ int rc_json_get_required_unum_array(uint32_t** entries, uint32_t* num_entries, r
   rc_json_iterator_t iterator;
   rc_json_field_t array;
   rc_json_field_t value;
-  unsigned* entry;
+  uint32_t* entry;
 
   memset(&array, 0, sizeof(array));
   if (!rc_json_get_required_array(num_entries, &array, response, field, field_name))
     return RC_MISSING_VALUE;
 
   if (*num_entries) {
-    *entries = (unsigned*)rc_buffer_alloc(&response->buffer, *num_entries * sizeof(unsigned));
+    *entries = (uint32_t*)rc_buffer_alloc(&response->buffer, *num_entries * sizeof(uint32_t));
     if (!*entries)
       return RC_OUT_OF_MEMORY;
 

deps/rcheevos/src/rcheevos/alloc.c

@@ -76,7 +76,7 @@ void* rc_alloc(void* pointer, int32_t* offset, uint32_t size, uint32_t alignment
     void** scratch_object_pointer = (void**)((char*)&scratch->objs + scratch_object_pointer_offset);
     ptr = *scratch_object_pointer;
     if (!ptr) {
-      int used;
+      int32_t used;
       ptr = *scratch_object_pointer = rc_alloc_scratch(NULL, &used, size, alignment, scratch, -1);
     }
   }

deps/rcheevos/src/rcheevos/runtime.c

@@ -128,7 +128,7 @@ int rc_runtime_activate_achievement(rc_runtime_t* self, uint32_t id, const char*
   rc_runtime_trigger_t* runtime_trigger;
   rc_parse_state_t parse;
   uint8_t md5[16];
-  int size;
+  uint32_t size;
   uint32_t i;
 
   if (memaddr == NULL)

deps/rcheevos/src/rhash/hash.c

@@ -1612,7 +1612,7 @@ static int rc_hash_dreamcast(char hash[33], const char* path)
 }
 
 static int rc_hash_find_playstation_executable(void* track_handle, const char* boot_key, const char* cdrom_prefix, 
-                                               char exe_name[], uint32_t exe_name_size, unsigned* exe_size)
+                                               char exe_name[], uint32_t exe_name_size, uint32_t* exe_size)
 {
   uint8_t buffer[2048];
   uint32_t size;
@@ -1626,7 +1626,7 @@ static int rc_hash_find_playstation_executable(void* track_handle, const char* b
   if (!sector)
     return 0;
 
-  size = (unsigned)rc_cd_read_sector(track_handle, sector, buffer, sizeof(buffer) - 1);
+  size = (uint32_t)rc_cd_read_sector(track_handle, sector, buffer, sizeof(buffer) - 1);
   buffer[size] = '\0';
 
   sector = 0;
@@ -1653,7 +1653,7 @@ static int rc_hash_find_playstation_executable(void* track_handle, const char* b
         while (!isspace((unsigned char)*ptr) && *ptr != ';')
           ++ptr;
 
-        size = (unsigned)(ptr - start);
+        size = (uint32_t)(ptr - start);
         if (size >= exe_name_size)
           size = exe_name_size - 1;