Use G_GUINT64_CONSTANT() to make a guint64_t (or uint64_t) constant.

Don't assume "UL" is good enough; long is 32 bits on ILP32 platforms.

Change-Id: If235e2e49afcbfff7d5289cafe24cf5cc01358e4
Reviewed-on: https://code.wireshark.org/review/8019
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2015-04-11 13:17:11 -07:00
parent 3195a20eef
commit ffe99c06ec
1 changed files with 2 additions and 2 deletions

View File

@ -1217,7 +1217,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
#define BLUEDROID_TIMESTAMP_SIZE 8
#define BLUEDROID_H4_SIZE 1
static const uint64_t BLUEDROID_TIMESTAMP_BASE = 0x00dcddb30f2f8000UL;
static const uint64_t BLUEDROID_TIMESTAMP_BASE = G_GUINT64_CONSTANT(0x00dcddb30f2f8000);
#define BLUEDROID_H4_PACKET_TYPE_HCI_CMD 0x01
#define BLUEDROID_H4_PACKET_TYPE_ACL 0x02
@ -1479,7 +1479,7 @@ static int capture_android_bluetooth_btsnoop_net(char *interface, char *fifo,
int result;
char *serial_number = NULL;
uint64_t ts;
static const uint64_t BTSNOOP_TIMESTAMP_BASE = 0x00dcddb30f2f8000UL;
static const uint64_t BTSNOOP_TIMESTAMP_BASE = G_GUINT64_CONSTANT(0x00dcddb30f2f8000);
uint32_t *reported_length;
uint32_t *captured_length;
uint32_t *flags;