Use G_GINT64_CONSTANT() for 64-bit constants.

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

1 files changed, 59 insertions, 59 deletions

diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c
index b329c06e3c..7158e88002 100644
--- a/epan/dissectors/packet-btsdp.c
+++ b/epan/dissectors/packet-btsdp.c
@@ -5404,197 +5404,197 @@ proto_register_btsdp(void)
         },
         { &hf_mps_mpsd_scenarios_reserved,
             { "Reserved",                                                                                    "btsdp.mps.mpsd_scenarios.reserved",
-            FT_UINT64, BASE_HEX, NULL, 0xFFFFFFC000000000,
+            FT_UINT64, BASE_HEX, NULL, G_GINT64_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, 0x0000002000000000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000001000000000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000800000000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000400000000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000200000000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000100000000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000080000000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000040000000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000020000000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000010000000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000008000000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000004000000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000002000000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000001000000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000800000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000400000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000200000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000100000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000080000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000040000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000020000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000010000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000008000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000004000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000002000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000001000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000000800,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000000400,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000000200,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000000100,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000000080,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000000040,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000000020,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000000010,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000000008,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000000004,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000000002,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000000001,
+            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000000001),
             NULL, HFILL }
         },
         { &hf_mps_mpmd_scenarios,
@@ -5604,102 +5604,102 @@ proto_register_btsdp(void)
         },
         { &hf_mps_mpmd_scenarios_reserved,
             { "Reserved",                                                                                    "btsdp.mps.mpmd_scenarios.reserved",
-            FT_UINT64, BASE_HEX, NULL, 0xFFFFFFFFFFF80000,
+            FT_UINT64, BASE_HEX, NULL, G_GINT64_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, 0x0000000000040000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000020000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000010000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000008000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000004000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000002000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000001000,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000000800,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000000400,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000000200,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000000100,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000000080,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000000040,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000000020,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000000010,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000000008,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000000004,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000000002,
+            FT_BOOLEAN, 64, NULL, G_GINT64_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, 0x0000000000000001,
+            FT_BOOLEAN, 64, NULL, G_GINT64_CONSTANT(0x0000000000000001),
             NULL, HFILL }
         },
         { &hf_mps_supported_profile_and_protocol_dependency,