From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 17 Apr 2023 09:14:15 +0000 (-0500)
Subject: M_ADDF should use u_int32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfdcd46dd497327f4b80bf1706efc35f5ceb0814;p=thirdparty%2Fntp.git

M_ADDF should use u_int32

bk: 643d0de7Hio7OgXx35jyI5ACqHA7GQ
---

diff --git a/ChangeLog b/ChangeLog
index 20ea42017..fc27b2be9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -79,6 +79,7 @@
              Integrated patch from Brian Utterback. <hart@ntp.org>
 * [Bug 2525] Turn on automake subdir-objects across the project. <hart@ntp.org>
 * [Bug 2410] syslog an error message on panic exceeded. <brian.utterback@oracle.com>
+* M_ADDF should use u_int32.  <hart@ntp.org>
 * Only define tv_fmt_libbuf() if we will use it. <stenn@ntp.org>
 * Use recv_buffer instead of the longer recv_space.X_recv_buffer. hart/stenn
 * Disable "embedded NUL in string" warnings in libopts, when we can. <stenn@>
diff --git a/include/ntp_fp.h b/include/ntp_fp.h
index afd1f8274..fe6e390a1 100644
--- a/include/ntp_fp.h
+++ b/include/ntp_fp.h
@@ -195,9 +195,9 @@ typedef u_int32 u_fp;
 	do { \
 		int32 add_f = (int32)(f); \
 		if (add_f >= 0) \
-			M_ADD((r_i), (r_f), 0, (uint32)( add_f)); \
+			M_ADD((r_i), (r_f), 0, (u_int32)( add_f)); \
 		else \
-			M_SUB((r_i), (r_f), 0, (uint32)(-add_f)); \
+			M_SUB((r_i), (r_f), 0, (u_int32)(-add_f)); \
 	} while(0)
 
 #define	M_ISNEG(v_i)			/* v < 0 */ \