From 90bd741786ea2cae3432b585f93bf8001fe77f9a Mon Sep 17 00:00:00 2001
From: Gregor Richards <hg-yff@gregor.im>
Date: Fri, 30 Sep 2016 15:37:02 -0400
Subject: [PATCH] Switching serialization quirks to uint64_t for consistency
 with other bitfields

---
 core.h                             |  4 ++--
 core_impl.c                        |  6 +++---
 libretro-common/include/libretro.h |  2 +-
 network/netplay/netplay.c          | 10 +++++-----
 network/netplay/netplay.h          |  2 +-
 network/netplay/netplay_private.h  |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/core.h b/core.h
index 258588c4ab..b7bf4657a8 100644
--- a/core.h
+++ b/core.h
@@ -178,9 +178,9 @@ bool core_set_environment(retro_ctx_environ_info_t *info);
 
 bool core_serialize_size(retro_ctx_size_info_t *info);
 
-uint32_t core_serialization_quirks(void);
+uint64_t core_serialization_quirks(void);
 
-void core_set_serialization_quirks(uint32_t quirks);
+void core_set_serialization_quirks(uint64_t quirks);
 
 bool core_serialize(retro_ctx_serialize_info_t *info);
 
diff --git a/core_impl.c b/core_impl.c
index 0f58f60633..cd86d1b058 100644
--- a/core_impl.c
+++ b/core_impl.c
@@ -52,7 +52,7 @@ static bool                core_game_loaded    = false;
 static bool                core_input_polled   = false;
 static bool   core_has_set_input_descriptors   = false;
 static struct retro_callbacks retro_ctx;
-static uint32_t            core_serialization_quirks_v = 0;
+static uint64_t            core_serialization_quirks_v = 0;
 
 static void core_input_state_poll_maybe(void)
 {
@@ -313,12 +313,12 @@ bool core_serialize_size(retro_ctx_size_info_t *info)
    return true;
 }
 
-uint32_t core_serialization_quirks(void)
+uint64_t core_serialization_quirks(void)
 {
    return core_serialization_quirks_v;
 }
 
-void core_set_serialization_quirks(uint32_t quirks)
+void core_set_serialization_quirks(uint64_t quirks)
 {
    core_serialization_quirks_v = quirks;
 }
diff --git a/libretro-common/include/libretro.h b/libretro-common/include/libretro.h
index 2ba7c6a50f..e1a3c46e71 100644
--- a/libretro-common/include/libretro.h
+++ b/libretro-common/include/libretro.h
@@ -996,7 +996,7 @@ struct retro_hw_render_context_negotiation_interface
     * one it was saved on. */
 
 #define RETRO_ENVIRONMENT_SET_SERIALIZATION_QUIRKS 44
-                                           /* uint32_t * --
+                                           /* uint64_t * --
                                             * Sets quirk flags associated with serialization.
                                             */
 
diff --git a/network/netplay/netplay.c b/network/netplay/netplay.c
index db582fe2bd..472e69a691 100644
--- a/network/netplay/netplay.c
+++ b/network/netplay/netplay.c
@@ -1016,7 +1016,7 @@ bool netplay_init_serialization(netplay_t *netplay)
    }
 
    /* Once initialized, we no longer exhibit this quirk */
-   netplay->quirks &= ~((uint32_t) NETPLAY_QUIRK_INITIALIZATION);
+   netplay->quirks &= ~((uint64_t) NETPLAY_QUIRK_INITIALIZATION);
 
    return true;
 }
@@ -1062,7 +1062,7 @@ static bool netplay_init_buffers(netplay_t *netplay, unsigned frames)
  **/
 netplay_t *netplay_new(const char *server, uint16_t port,
       unsigned frames, unsigned check_frames, const struct retro_callbacks *cb,
-      bool spectate, const char *nick, uint32_t quirks)
+      bool spectate, const char *nick, uint64_t quirks)
 {
    netplay_t *netplay = (netplay_t*)calloc(1, sizeof(*netplay));
    if (!netplay)
@@ -1398,8 +1398,8 @@ bool init_netplay(bool is_spectate, const char *server, unsigned port)
 {
    struct retro_callbacks cbs = {0};
    settings_t *settings = config_get_ptr();
-   uint32_t serialization_quirks = 0;
-   uint32_t quirks      = 0;
+   uint64_t serialization_quirks = 0;
+   uint64_t quirks      = 0;
 
    if (!netplay_enabled)
       return false;
@@ -1415,7 +1415,7 @@ bool init_netplay(bool is_spectate, const char *server, unsigned port)
 
    /* Map the core's quirks to our quirks */
    serialization_quirks = core_serialization_quirks();
-   if ((serialization_quirks & ~((uint32_t) NETPLAY_QUIRK_MAP_UNDERSTOOD)))
+   if ((serialization_quirks & ~((uint64_t) NETPLAY_QUIRK_MAP_UNDERSTOOD)))
    {
       /* Quirks we don't support! Just disable everything. */
       quirks |= NETPLAY_QUIRK_NO_SAVESTATES;
diff --git a/network/netplay/netplay.h b/network/netplay/netplay.h
index 703437e0fc..4900a85530 100644
--- a/network/netplay/netplay.h
+++ b/network/netplay/netplay.h
@@ -149,7 +149,7 @@ size_t audio_sample_batch_net(const int16_t *data, size_t frames);
 netplay_t *netplay_new(const char *server,
       uint16_t port, unsigned frames, unsigned check_frames,
       const struct retro_callbacks *cb, bool spectate,
-      const char *nick, uint32_t quirks);
+      const char *nick, uint64_t quirks);
 
 /**
  * netplay_free:
diff --git a/network/netplay/netplay_private.h b/network/netplay/netplay_private.h
index 35cb47c530..a5041667b6 100644
--- a/network/netplay/netplay_private.h
+++ b/network/netplay/netplay_private.h
@@ -140,7 +140,7 @@ struct netplay
    bool force_rewind;
 
    /* Quirks in the savestate implementation */
-   unsigned quirks;
+   uint64_t quirks;
 
    /* Force our state to be sent to the other side. Used when they request a
     * savestate, to send at the next pre-frame. */