[asterisk-commits] rmudgett: trunk r365479 - in /trunk: ./ tests/test_config.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Mon May  7 13:51:44 2012
New Revision: 365479

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=365479
Log:
Fix type punned compiler warning in test_config.c
........

Merged revisions 365476 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 365478 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/tests/test_config.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/tests/test_config.c
URL: http://svnview.digium.com/svn/asterisk/trunk/tests/test_config.c?view=diff&rev=365479&r1=365478&r2=365479
==============================================================================
--- trunk/tests/test_config.c (original)
+++ trunk/tests/test_config.c Mon May  7 13:51:44 2012
@@ -59,19 +59,22 @@
 		ret = AST_TEST_FAIL; \
 	} else { \
 		if (((flags) & PARSE_TYPE) == PARSE_INT32) { \
-			int32_t *r = (int32_t *) result, e = (int32_t) expected_result; \
+			int32_t *r = (int32_t *) (void *) result; \
+			int32_t e = (int32_t) expected_result; \
 			if (*r != e) { \
 				ast_test_status_update(test, "ast_parse_arg int32_t failed with %d != %d\n", *r, e); \
 				ret = AST_TEST_FAIL; \
 			} \
 		} else if (((flags) & PARSE_TYPE) == PARSE_UINT32) { \
-			uint32_t *r = (uint32_t *) result, e = (uint32_t) expected_result; \
+			uint32_t *r = (uint32_t *) (void *) result; \
+			uint32_t e = (uint32_t) expected_result; \
 			if (*r != e) { \
 				ast_test_status_update(test, "ast_parse_arg uint32_t failed with %u != %u\n", *r, e); \
 				ret = AST_TEST_FAIL; \
 			} \
 		} else if (((flags) & PARSE_TYPE) == PARSE_DOUBLE) { \
-			double *r = (double *) result, e = (double) expected_result; \
+			double *r = (double *) (void *) result; \
+			double e = (double) expected_result; \
 			if (fabs(*r - e) > EPSILON) { \
 				ast_test_status_update(test, "ast_parse_arg double failed with %f != %f\n", *r, e); \
 				ret = AST_TEST_FAIL; \