summaryrefslogtreecommitdiffstats
path: root/wsutil/sign_ext.h
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:14:53 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:14:53 +0000
commita86c5f7cae7ec9a3398300555a0b644689d946a1 (patch)
tree39fe4b107c71174fd1e8a8ceb9a4d2aa14116248 /wsutil/sign_ext.h
parentReleasing progress-linux version 4.2.6-1~progress7.99u1. (diff)
downloadwireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.tar.xz
wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.zip
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'wsutil/sign_ext.h')
-rw-r--r--wsutil/sign_ext.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/wsutil/sign_ext.h b/wsutil/sign_ext.h
index 67401edb..e8c622a9 100644
--- a/wsutil/sign_ext.h
+++ b/wsutil/sign_ext.h
@@ -52,8 +52,8 @@ ws_sign_ext64(uint64_t val, int no_of_bits)
* the number of bits in the value - 1, and we might get
* compile-time or run-time complaints about that.
*/
- if (val & (G_GUINT64_CONSTANT(1) << (no_of_bits-1)))
- val |= (G_GUINT64_CONSTANT(0xFFFFFFFFFFFFFFFF) << no_of_bits);
+ if (val & (UINT64_C(1) << (no_of_bits-1)))
+ val |= (UINT64_C(0xFFFFFFFFFFFFFFFF) << no_of_bits);
return val;
}