Fix some more constants to be unsigned.

Change-Id: I714078683cff517c79a15abf29e1ae4a9a60271d
Reviewed-on: https://code.wireshark.org/review/8365
Reviewed-by: Guy Harris <guy@alum.mit.edu>

5 files changed, 72 insertions, 72 deletions

diff --git a/epan/dissectors/packet-btavrcp.c b/epan/dissectors/packet-btavrcp.c
index b1b6e78e67..715a2a5a87 100644
--- a/epan/dissectors/packet-btavrcp.c
+++ b/epan/dissectors/packet-btavrcp.c
@@ -1569,10 +1569,10 @@ dissect_vendor_dependant(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
                         offset += 8;
 
                         col_append_fstr(pinfo->cinfo, COL_INFO, " - 0x%08X%08X", (guint) (identifier >> 32), (guint) (identifier & 0xFFFFFFFF));
-                        if (identifier == G_GINT64_CONSTANT(0x0000000000000000)) {
+                        if (identifier == G_GUINT64_CONSTANT(0x0000000000000000)) {
                             col_append_str(pinfo->cinfo, COL_INFO, " (SELECTED)");
                             proto_item_append_text(pitem, " (SELECTED)");
-                        } else if (identifier == G_GINT64_CONSTANT(0xFFFFFFFFFFFFFFFF)) {
+                        } else if (identifier == G_GUINT64_CONSTANT(0xFFFFFFFFFFFFFFFF)) {
                             col_append_str(pinfo->cinfo, COL_INFO, " (NOT SELECTED)");
                             proto_item_append_text(pitem, " (NOT SELECTED)");
                         }
diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c
index 7b914f70e6..daeeccbc8d 100644
--- a/epan/dissectors/packet-btsdp.c
+++ b/epan/dissectors/packet-btsdp.c
@@ -5604,197 +5604,197 @@ proto_register_btsdp(void)
         },
         { &hf_mps_mpsd_scenarios_reserved,
             { "Reserved",                                                                                    "btsdp.mps.mpsd_scenarios.reserved",
-            FT_UINT64, BASE_HEX, NULL, G_GINT64_CONSTANT(0xFFFFFFC000000000),
+            FT_UINT64, BASE_HEX, NULL, G_GUINT64_CONSTANT(0xFFFFFFC000000000),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_37,
             { "Phonebook Download during Audio Streaming (A2DP-SNK_PBAP-Client)",                            "btsdp.mps.mpsd_scenarios.37",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000002000000000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000002000000000),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_36,
             { "Phonebook Download during Audio Streaming (A2DP-SRC_PBAP-Server)",                            "btsdp.mps.mpsd_scenarios.36",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000001000000000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000001000000000),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_35,
             { "Data communication establishment in Personal Area Network during Audio Streaming (A2DP-SNK_PAN_PANU)",  "btsdp.mps.mpsd_scenarios.35",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000800000000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000800000000),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_34,
             { "Data communication establishment in Personal Area Network during Audio Streaming (A2DP-SRC_PAN-NAP)",   "btsdp.mps.mpsd_scenarios.34",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000400000000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000400000000),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_33,
             { "Start Audio Streaming during Data communication in Personal Area Network (A2DP-SNK_PAN-PANU)",          "btsdp.mps.mpsd_scenarios.33",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000200000000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000200000000),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_32,
             { "Start Audio Streaming during Data communication in Personal Area Network (A2DP-SRC_PAN-NAP)",           "btsdp.mps.mpsd_scenarios.32",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000100000000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000100000000),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_31,
             { "Incoming voice call during Data communication in Personal Area Network (HFP-HF_PAN-PANU)",              "btsdp.mps.mpsd_scenarios.31",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000080000000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000080000000),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_30,
             { "Incoming voice call during Data communication in Personal Area Network (HFP-AG_PAN-NAP)",               "btsdp.mps.mpsd_scenarios.30",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000040000000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000040000000),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_29,
             { "Outgoing voice call during Data communication in Personal Area Network (HFP-HF_PAN-PANU)",              "btsdp.mps.mpsd_scenarios.29",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000020000000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000020000000),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_28,
             { "Outgoing voice call during Data communication in Personal Area Network (HFP-AG_PAN-NAP)",               "btsdp.mps.mpsd_scenarios.28",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000010000000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000010000000),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_27,
             { "Data communication in Personal Area Network during active voice call (HFP-HF_PAN-PANU)",                "btsdp.mps.mpsd_scenarios.27",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000008000000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000008000000),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_26,
             { "Data communication in Personal Area Network during active voice call (HFP-AG_PAN-NAP)",                 "btsdp.mps.mpsd_scenarios.26",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000004000000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000004000000),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_25,
             { "Terminate voice call / data call during data communication and voice call (HFP-HF_DUN-DT)",             "btsdp.mps.mpsd_scenarios.25",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000002000000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000002000000),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_24,
             { "Terminate voice call / data call during data communication and voice call (HFP-AG_DUN-GW)",             "btsdp.mps.mpsd_scenarios.24",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000001000000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000001000000),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_23,
             { "Data communication establishment under PSDM (DUN) during Audio Streaming (A2DP-SNK_DUN-DT)",            "btsdp.mps.mpsd_scenarios.23",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000800000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000800000),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_22,
             { "Data communication establishment under PSDM (DUN) during Audio Streaming (A2DP-SRC_DUN-GW)",            "btsdp.mps.mpsd_scenarios.22",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000400000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000400000),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_21,
             { "Start Audio Streaming during Data communication under PSDM (DUN) (A2DP-SNK_DUN-DT)",                    "btsdp.mps.mpsd_scenarios.21",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000200000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000200000),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_20,
             { "Start Audio Streaming during Data communication under PSDM (DUN) (A2DP-SRC_DUN-GW)",                    "btsdp.mps.mpsd_scenarios.20",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000100000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000100000),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_19,
             { "Incoming voice call during Data communication under PSDM (DUN) (HFP-HF_DUN-DT)",                        "btsdp.mps.mpsd_scenarios.19",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000080000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000080000),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_18,
             { "Incoming voice call during Data communication under PSDM (DUN) (HFP-AG_DUN-GW)",                        "btsdp.mps.mpsd_scenarios.18",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000040000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000040000),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_17,
             { "Outgoing voice call during Data communication under PSDM (DUN) (HFP-HF_DUN-DT)",                        "btsdp.mps.mpsd_scenarios.17",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000020000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000020000),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_16,
             { "Outgoing voice call during Data communication under PSDM (DUN) (HFP-AG_DUN-GW)",                        "btsdp.mps.mpsd_scenarios.16",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000010000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000010000),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_15,
             { "Data communication under PSDM (DUN) during active voice call (HFP-HF_DUN-DT)",                          "btsdp.mps.mpsd_scenarios.15",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000008000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000008000),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_14,
             { "Data communication under PSDM (DUN) during active voice call (HFP-AG_DUN-GW)",                          "btsdp.mps.mpsd_scenarios.14",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000004000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000004000),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_13,
             { "Suspend Audio Streaming after AVRCP Pause/Stop (HFP-HF_A2DP-SNK)",                            "btsdp.mps.mpsd_scenarios.13",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000002000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000002000),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_12,
             { "Suspend Audio Streaming after AVRCP Pause/Stop (HFP-AG_A2DP-SRC)",                            "btsdp.mps.mpsd_scenarios.12",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000001000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000001000),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_11,
             { "Start Audio Streaming after AVRCP Play Command (HFP-HF_A2DP-SNK)",                            "btsdp.mps.mpsd_scenarios.11",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000000800),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000000800),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_10,
             { "Start Audio Streaming after AVRCP Play Command (HFP-AG_A2DP-SRC)",                            "btsdp.mps.mpsd_scenarios.10",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000000400),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000000400),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_9,
             { "Press Play on Audio Player during active call (HFP-HF_A2DP-SNK)",                             "btsdp.mps.mpsd_scenarios.9",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000000200),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000000200),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_8,
             { "Press Play on Audio Player during active call (HFP-AG_A2DP-SRC)",                             "btsdp.mps.mpsd_scenarios.8",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000000100),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000000100),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_7,
             { "HFP call termination during AVP connection (HFP-HF_A2DP-SNK)",                                "btsdp.mps.mpsd_scenarios.7",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000000080),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000000080),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_6,
             { "HFP call termination during AVP connection (HFP-AG_A2DP-SRC)",                                "btsdp.mps.mpsd_scenarios.6",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000000040),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000000040),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_5,
             { "Reject/Ignore Incoming Call during Audio Streaming (HFP-HF_A2DP-SNK)",                        "btsdp.mps.mpsd_scenarios.5",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000000020),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000000020),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_4,
             { "Reject/Ignore Incoming Call during Audio Streaming (HFP-AG_A2DP-SRC)",                        "btsdp.mps.mpsd_scenarios.4",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000000010),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000000010),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_3,
             { "Outgoing Call during Audio Streaming (HFP-HF_A2DP-SNK)",                                      "btsdp.mps.mpsd_scenarios.3",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000000008),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000000008),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_2,
             { "Outgoing Call during Audio Streaming (HFP-AG_A2DP-SRC)",                                      "btsdp.mps.mpsd_scenarios.2",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000000004),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000000004),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_1,
             { "Answer Incoming Call during Audio Streaming (HFP-HF_A2DP-SNK)",                               "btsdp.mps.mpsd_scenarios.1",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000000002),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000000002),
             NULL, HFILL }
         },
         { &hf_mps_mpsd_scenarios_0,
             { "Answer Incoming Call during Audio Streaming (HFP-AG_A2DP-SRC)",                               "btsdp.mps.mpsd_scenarios.0",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000000001),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000000001),
             NULL, HFILL }
         },
         { &hf_mps_mpmd_scenarios,
@@ -5804,102 +5804,102 @@ proto_register_btsdp(void)
         },
         { &hf_mps_mpmd_scenarios_reserved,
             { "Reserved",                                                                                    "btsdp.mps.mpmd_scenarios.reserved",
-            FT_UINT64, BASE_HEX, NULL, G_GINT64_CONSTANT(0xFFFFFFFFFFF80000),
+            FT_UINT64, BASE_HEX, NULL, G_GUINT64_CONSTANT(0xFFFFFFFFFFF80000),
             NULL, HFILL }
         },
         { &hf_mps_mpmd_scenarios_18,
             { "Start Packet data communication during Audio streaming (A2DP-SNK_AVRCP-CT_DUN-DT)",           "btsdp.mps.mpmd_scenarios.18",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000040000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000040000),
             NULL, HFILL }
         },
         { &hf_mps_mpmd_scenarios_17,
             { "Start Packet data communication during Audio streaming (A2DP-SRC_AVRCP-TG)",                  "btsdp.mps.mpmd_scenarios.17",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000020000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000020000),
             NULL, HFILL }
         },
         { &hf_mps_mpmd_scenarios_16,
             { "Start Audio streaming during Data communication under PSDM (A2DP-SNK_AVRCP-CT_DUN-DT)",       "btsdp.mps.mpmd_scenarios.16",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000010000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000010000),
             NULL, HFILL }
         },
         { &hf_mps_mpmd_scenarios_15,
             { "Start Audio streaming during Data communication under PSDM (A2DP-SRC_AVRCP-TG)",              "btsdp.mps.mpmd_scenarios.15",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000008000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000008000),
             NULL, HFILL }
         },
         { &hf_mps_mpmd_scenarios_14,
             { "Suspend Audio Streaming after AVRCP Pause/Stop (A2DP-SRC_AVRCP-TG)",                          "btsdp.mps.mpmd_scenarios.14",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000004000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000004000),
             NULL, HFILL }
         },
         { &hf_mps_mpmd_scenarios_13,
             { "Suspend Audio Streaming after AVRCP Pause/Stop (AVRCP-CT where the same device does not carry out the role of an A2DP SNK)",     "btsdp.mps.mpmd_scenarios.13",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000002000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000002000),
             NULL, HFILL }
         },
         { &hf_mps_mpmd_scenarios_12,
             { "Start Audio Streaming after AVRCP Play Command (A2DP-SRC_AVRCP-TG)",                                                             "btsdp.mps.mpmd_scenarios.12",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000001000),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000001000),
             NULL, HFILL }
         },
         { &hf_mps_mpmd_scenarios_11,
             { "Start Audio Streaming after AVRCP Play Command (AVRCP-CT where the same device does not carry out the role of an A2DP SNK)",     "btsdp.mps.mpmd_scenarios.11",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000000800),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000000800),
             NULL, HFILL }
         },
         { &hf_mps_mpmd_scenarios_10,
             { "Press Play on Audio Player during active call (A2DP-SRC_AVRCP-TG)",                 "btsdp.mps.mpmd_scenarios.10",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000000400),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000000400),
             NULL, HFILL }
         },
         { &hf_mps_mpmd_scenarios_9,
             { "Press Play on Audio Player during active call (HFP-HF_A2DP-SNK_AVRCP-CT)",          "btsdp.mps.mpmd_scenarios.9",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000000200),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000000200),
             NULL, HFILL }
         },
         { &hf_mps_mpmd_scenarios_8,
             { "HFP Call termination during AVP connection (A2DP-SRC_AVRCP-TG)",                    "btsdp.mps.mpmd_scenarios.8",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000000100),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000000100),
             NULL, HFILL }
         },
         { &hf_mps_mpmd_scenarios_7,
             { "HFP Call termination during AVP connection (HFP-HF_ A2DP-SNK_AVRCP-CT)",            "btsdp.mps.mpmd_scenarios.7",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000000080),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000000080),
             NULL, HFILL }
         },
         { &hf_mps_mpmd_scenarios_6,
             { "HFP Call termination during AVP connection (HFP-AG)",                               "btsdp.mps.mpmd_scenarios.6",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000000040),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000000040),
             NULL, HFILL }
         },
         { &hf_mps_mpmd_scenarios_5,
             { "Reject/Ignore Incoming Call during Audio Streaming (A2DP-SRC_AVRCP-TG)",            "btsdp.mps.mpmd_scenarios.5",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000000020),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000000020),
             NULL, HFILL }
         },
         { &hf_mps_mpmd_scenarios_4,
             { "Reject/Ignore Incoming Call during Audio Streaming (HFP-HF_A2DP-SNK_AVRCP-CT)",     "btsdp.mps.mpmd_scenarios.4",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000000010),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000000010),
             NULL, HFILL }
         },
         { &hf_mps_mpmd_scenarios_3,
             { "Outgoing Call during Audio Streaming (A2DP-SRC_AVRCP-TG)",                          "btsdp.mps.mpmd_scenarios.3",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000000008),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000000008),
             NULL, HFILL }
         },
         { &hf_mps_mpmd_scenarios_2,
             { "Outgoing Call during Audio Streaming (HFP-HF_A2DP-SNK_AVRCP-CT)",                   "btsdp.mps.mpmd_scenarios.2",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000000004),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000000004),
             NULL, HFILL }
         },
         { &hf_mps_mpmd_scenarios_1,
             { "Answer Incoming Call during Audio Streaming (A2DP-SRC_AVRCP-TG)",                   "btsdp.mps.mpmd_scenarios.1",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000000002),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000000002),
             NULL, HFILL }
         },
         { &hf_mps_mpmd_scenarios_0,
             { "Answer Incoming Call during Audio Streaming (HFP-HF_A2DP-SNK_AVRCP-CT)",            "btsdp.mps.mpmd_scenarios.0",
-            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000000001),
+            FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x0000000000000001),
             NULL, HFILL }
         },
         { &hf_mps_supported_profile_and_protocol_dependency,
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index 4cddbe47c3..a5350b40ed 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -7752,7 +7752,7 @@ add_ff_psmp_sta_info(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, in
                           hf_ieee80211_ff_psmp_sta_info_reserved_large,
                           tvb, offset, 8,
                           (tvb_get_letoh64(tvb, offset) &
-                           G_GINT64_CONSTANT(0xFFFFFFFFFFE00000)) >> 21);
+                           G_GUINT64_CONSTANT(0xFFFFFFFFFFE00000)) >> 21);
     break;
   case PSMP_STA_INFO_MULTICAST:
     proto_tree_add_item(psmp_tree,
@@ -7765,7 +7765,7 @@ add_ff_psmp_sta_info(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, in
                           hf_ieee80211_ff_psmp_sta_info_psmp_multicast_id,
                           tvb, offset, 6,
                           (tvb_get_letoh64(tvb, offset) &
-                           G_GINT64_CONSTANT(0xFFFFFFFFFFE00000)) >> 21);
+                           G_GUINT64_CONSTANT(0xFFFFFFFFFFE00000)) >> 21);
     break;
   case PSMP_STA_INFO_INDIVIDUALLY_ADDRESSED:
     proto_tree_add_item(psmp_tree,
@@ -17206,7 +17206,7 @@ dissect_ieee80211_common (tvbuff_t *tvb, packet_info *pinfo,
                 ba_bitmap_item = proto_tree_add_item(hdr_tree, hf_ieee80211_block_ack_bitmap, tvb, offset, 8, ENC_NA);
                 ba_bitmap_tree = proto_item_add_subtree(ba_bitmap_item, ett_block_ack_bitmap);
                 for (f = 0; f < 64; f++) {
-                  if (bmap & (G_GINT64_CONSTANT(1) << f))
+                  if (bmap & (G_GUINT64_CONSTANT(1) << f))
                     continue;
                   proto_tree_add_uint_format_value(ba_bitmap_tree, hf_ieee80211_block_ack_bitmap_missing_frame,
                                                    tvb, offset + (f/8), 1, ssn + f, "%u", ssn + f);
@@ -17234,7 +17234,7 @@ dissect_ieee80211_common (tvbuff_t *tvb, packet_info *pinfo,
                 ba_bitmap_item = proto_tree_add_item(hdr_tree, hf_ieee80211_block_ack_bitmap, tvb, offset, 8, ENC_NA);
                 ba_bitmap_tree = proto_item_add_subtree(ba_bitmap_item, ett_block_ack_bitmap);
                 for (f = 0; f < 64; f++) {
-                  if (bmap & (G_GINT64_CONSTANT(1) << f))
+                  if (bmap & (G_GUINT64_CONSTANT(1) << f))
                     continue;
                   proto_tree_add_uint_format_value(ba_bitmap_tree, hf_ieee80211_block_ack_bitmap_missing_frame,
                                                    tvb, offset + (f/8), 1, ssn + f, "%u", (ssn + f) & 0x0fff);
diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c
index a1293a06b5..7c687709de 100644
--- a/epan/dissectors/packet-netflow.c
+++ b/epan/dissectors/packet-netflow.c
@@ -5538,7 +5538,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree,
             }
             break;
         case 37071: /* bytes_out_of_order */
-            if (tvb_get_ntoh64(tvb, offset) == G_GINT64_CONSTANT(0xFFFFFFFFFFFFFFFF)) {
+            if (tvb_get_ntoh64(tvb, offset) == G_GUINT64_CONSTANT(0xFFFFFFFFFFFFFFFF)) {
                 /* need to add custom code to show "Not Measured"  */
                 proto_tree_add_expert_format(pdutree, NULL, &ei_transport_bytes_out_of_order,
                                              tvb, offset, 8,
diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c
index d1f8a3249d..4741a2b6d8 100644
--- a/epan/dissectors/packet-per.c
+++ b/epan/dissectors/packet-per.c
@@ -1127,7 +1127,7 @@ static guint32
 dissect_per_integer64b(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, gint64 *value)
 {
 	guint32 i, length;
-	gint64 val;
+	guint64 val;
 	proto_item *it=NULL;
 	header_field_info *hfi;
 
@@ -1144,7 +1144,7 @@ dissect_per_integer64b(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tr
 		if(i==0){
 			if(tvb_get_guint8(tvb, offset>>3)&0x80){
 				/* negative number */
-				val=G_GINT64_CONSTANT(0xffffffffffffffff);
+				val=G_GUINT64_CONSTANT(0xffffffffffffffff);
 			} else {
 				/* positive number */
 				val=0;
@@ -1158,7 +1158,7 @@ dissect_per_integer64b(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tr
 	if (! hfi)
 		THROW(ReportedBoundsError);
 	if (IS_FT_INT(hfi->type)) {
-		it=proto_tree_add_int64(tree, hf_index, tvb, (offset>>3)-(length+1), length+1, val);
+		it=proto_tree_add_int64(tree, hf_index, tvb, (offset>>3)-(length+1), length+1, (gint64)val);
 	} else if (IS_FT_UINT(hfi->type)) {
 		it=proto_tree_add_uint64(tree, hf_index, tvb, (offset>>3)-(length+1), length+1, val);
 	} else {
@@ -1170,7 +1170,7 @@ dissect_per_integer64b(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tr
 	actx->created_item = it;
 
 	if(value){
-		*value=val;
+		*value=(gint64)val;
 	}
 
 	return offset;
@@ -1430,8 +1430,8 @@ DEBUG_ENTRY("dissect_per_constrained_integer_64b");
 		int i, bit, length, str_length, str_index;
 		guint64 mask,mask2;
 		/* We only handle 64 bit integers */
-		mask  = G_GINT64_CONSTANT(0x8000000000000000);
-		mask2 = G_GINT64_CONSTANT(0x7fffffffffffffff);
+		mask  = G_GUINT64_CONSTANT(0x8000000000000000);
+		mask2 = G_GUINT64_CONSTANT(0x7fffffffffffffff);
 		i = 64;
 		while ((range & mask)== 0){
 			i = i - 1;