summaryrefslogtreecommitdiffstats
path: root/contrib/ntp/sntp/unity/unity_internals.h
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2016-01-22 20:41:56 +0000
committerdim <dim@FreeBSD.org>2016-01-22 20:41:56 +0000
commit7cf07624a0c8bc9de65a351f13206cea487afb48 (patch)
tree10bd7a9c1abe1f278df85958745a2a09074c1dda /contrib/ntp/sntp/unity/unity_internals.h
parentf011e361d3e821edf47ec30d69116ed25a05b696 (diff)
parent66dd616ca8c4d3779be38f549e7e793674dbfd03 (diff)
downloadFreeBSD-src-7cf07624a0c8bc9de65a351f13206cea487afb48.zip
FreeBSD-src-7cf07624a0c8bc9de65a351f13206cea487afb48.tar.gz
Merge ^/head r294169 through r294598.
Diffstat (limited to 'contrib/ntp/sntp/unity/unity_internals.h')
-rw-r--r--contrib/ntp/sntp/unity/unity_internals.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/ntp/sntp/unity/unity_internals.h b/contrib/ntp/sntp/unity/unity_internals.h
index bf1bf3d..f1cc400 100644
--- a/contrib/ntp/sntp/unity/unity_internals.h
+++ b/contrib/ntp/sntp/unity/unity_internals.h
@@ -614,7 +614,7 @@ extern const char UnityStrErr64[];
#define UNITY_TEST_ASSERT_EQUAL_PTR(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(_UP)(expected), (_U_SINT)(_UP)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_POINTER)
#define UNITY_TEST_ASSERT_EQUAL_STRING(expected, actual, line, message) UnityAssertEqualString((const char*)(expected), (const char*)(actual), (message), (UNITY_LINE_TYPE)line)
-#define UNITY_TEST_ASSERT_EQUAL_MEMORY(expected, actual, len, line, message) UnityAssertEqualMemory((UNITY_PTR_ATTRIBUTE void*)(expected), (UNITY_PTR_ATTRIBUTE void*)(actual), (_UU32)(len), 1, (message), (UNITY_LINE_TYPE)line)
+#define UNITY_TEST_ASSERT_EQUAL_MEMORY(expected, actual, len, line, message) UnityAssertEqualMemory((UNITY_PTR_ATTRIBUTE const void*)(expected), (UNITY_PTR_ATTRIBUTE const void*)(actual), (_UU32)(len), 1, (message), (UNITY_LINE_TYPE)line)
#define UNITY_TEST_ASSERT_EQUAL_INT_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const void*)(expected), (UNITY_PTR_ATTRIBUTE const void*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT)
#define UNITY_TEST_ASSERT_EQUAL_INT8_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const void*)(expected), (UNITY_PTR_ATTRIBUTE const void*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT8)
OpenPOWER on IntegriCloud